Fix #456

Goldorion · Aug 22, 2023 · 1211c78 · 1211c78
1 parent 073bb38
commit 1211c78
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/changelog.md b/changelog.md
@@ -2,6 +2,7 @@
 
 ## 1.9.7
 * [Bugfix #454] World dependency caused a build error in custom commands
+* [Bugfix #456] Fix several registries calls causing build errors
 
 ## 1.9.6
 * [Bugfix #431] Get enchantment level caused a build error

diff --git a/src/fabric-1.20.1/procedures/block_is_tagged_in.java.ftl b/src/fabric-1.20.1/procedures/block_is_tagged_in.java.ftl
@@ -1,3 +1,3 @@
 <#include "mcelements.ftl">
 <#include "mcitems.ftl">
-(${mappedBlockToBlockStateCode(input$a)}.is(TagKey.create(Registry.BLOCK_REGISTRY, ${toResourceLocation(input$b)})))
+(${mappedBlockToBlockStateCode(input$a)}.is(TagKey.create(Registries.BLOCK, ${toResourceLocation(input$b)})))
diff --git a/src/fabric-1.20.1/procedures/entity_submerged_height.java.ftl b/src/fabric-1.20.1/procedures/entity_submerged_height.java.ftl
@@ -1,6 +1,6 @@
 (new Object() {
 	public double getSubmergedHeight(Entity _entity) {
-		for (TagKey<Fluid> _fldtag : Registry.FLUID.getTagNames().toList()) {
+		for (TagKey<Fluid> _fldtag : Registries.FLUID.getTagNames().toList()) {
 			if (_entity.level().getFluidState(_entity.blockPosition()).is(_fldtag))
 				return _entity.getFluidHeight(_fldtag);
 		}

diff --git a/src/fabric-1.20.1/templates/feature/feature.java.ftl b/src/fabric-1.20.1/templates/feature/feature.java.ftl
@@ -48,7 +48,7 @@ public class ${name}Feature extends ${generator.map(featuretype, "features")} {
 		<#if data.restrictionBiomes?has_content>
 			includeByKey(
 				<#list data.restrictionBiomes as restrictionBiome>
-					ResourceKey.create( Registries.BIOME, new ResourceLocation("${restrictionBiome}"))<#if restrictionBiome?has_next>,</#if>
+					ResourceKey.create(Registries.BIOME, new ResourceLocation("${restrictionBiome}"))<#if restrictionBiome?has_next>,</#if>
 				</#list>
 			)
 		<#else>
@@ -65,7 +65,7 @@ public class ${name}Feature extends ${generator.map(featuretype, "features")} {
 				<#elseif dimension == "End">
 					Level.END
 				<#else>
-					ResourceKey.create(Registry.DIMENSION_REGISTRY,
+					ResourceKey.create(Registries.DIMENSION,
 						new ResourceLocation("${generator.getResourceLocationForModElement(dimension.toString().replace("CUSTOM:", ""))}"))
 				</#if><#sep>,
 			</#list>

diff --git a/src/fabric-1.20.1/templates/plant/plantgen.java.ftl b/src/fabric-1.20.1/templates/plant/plantgen.java.ftl
@@ -42,7 +42,7 @@ public class ${name}Feature extends RandomPatchFeature {
 		<#if data.restrictionBiomes?has_content>
 			includeByKey(
 				<#list data.restrictionBiomes as restrictionBiome>
-					ResourceKey.create( Registries.BIOME, new ResourceLocation("${restrictionBiome}"))<#if restrictionBiome?has_next>,</#if>
+					ResourceKey.create(Registries.BIOME, new ResourceLocation("${restrictionBiome}"))<#if restrictionBiome?has_next>,</#if>
 				</#list>
 			)
 		<#else>
@@ -58,7 +58,7 @@ public class ${name}Feature extends RandomPatchFeature {
 			<#elseif worldType == "End">
 				Level.END
 			<#else>
-				ResourceKey.create(Registry.DIMENSION_REGISTRY,
+				ResourceKey.create(Registries.DIMENSION,
 						new ResourceLocation("${generator.getResourceLocationForModElement(worldType.toString().replace("CUSTOM:", ""))}"))
 			</#if><#sep>,
 		</#list>

diff --git a/src/fabric-1.20.1/templates/structure.java.ftl b/src/fabric-1.20.1/templates/structure.java.ftl
@@ -43,7 +43,7 @@ public class ${name}Feature extends Feature<NoneFeatureConfiguration> {
 		<#if data.restrictionBiomes?has_content>
 			includeByKey(
 				<#list data.restrictionBiomes as restrictionBiome>
-					ResourceKey.create( Registries.BIOME, new ResourceLocation("${restrictionBiome}"))<#if restrictionBiome?has_next>,</#if>
+					ResourceKey.create(Registries.BIOME, new ResourceLocation("${restrictionBiome}"))<#if restrictionBiome?has_next>,</#if>
 				</#list>
 			)
 		<#else>
@@ -59,7 +59,7 @@ public class ${name}Feature extends Feature<NoneFeatureConfiguration> {
 			<#elseif worldType == "End">
 				Level.END
 			<#else>
-				ResourceKey.create(Registry.DIMENSION_REGISTRY,
+				ResourceKey.create(Registries.DIMENSION,
 					new ResourceLocation("${generator.getResourceLocationForModElement(worldType.toString().replace("CUSTOM:", ""))}"))
 			</#if><#sep>,
 		</#list>