Skip to content

Commit 5b68245

Browse files
committed
Some fixes
1 parent b0bcfa6 commit 5b68245

File tree

8 files changed

+132
-133
lines changed

8 files changed

+132
-133
lines changed

src/main/resources/datapack-1.15.x/mappings/configuredfeatures.yaml

Lines changed: 120 additions & 122 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
${generator.map(field$feature, "configuredfeatures")}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
NoFeatureConfig.NO_FEATURE_CONFIG
1+
IFeatureConfig.NO_FEATURE_CONFIG
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
NoFeatureConfig.NO_FEATURE_CONFIG
1+
IFeatureConfig.NO_FEATURE_CONFIG
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
NoFeatureConfig.NO_FEATURE_CONFIG
1+
IFeatureConfig.NO_FEATURE_CONFIG
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
NoFeatureConfig.NO_FEATURE_CONFIG
1+
IFeatureConfig.NO_FEATURE_CONFIG

src/main/resources/forge-1.15.2/templates/feature/feature.java.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public class ${name}Feature extends ${generator.map(featuretype, "features")} {
7070
public static Feature<?> feature() {
7171
Random random = new Random();
7272
FEATURE = new ${name}Feature();
73-
CONFIGURED_FEATURE = <#if featuretype == "configured_feature_reference">${nonHardcodedConfiguration}<#else>FEATURE.withConfiguration(<#if nonHardcodedConfiguration == "">NoFeatureConfig.NO_FEATURE_CONFIG<#else>${nonHardcodedConfiguration}</#if>)</#if><#if data.hasPlacedFeature()>${nonHardcodedPlacement}</#if>;
73+
CONFIGURED_FEATURE = <#if featuretype == "configured_feature_reference">${nonHardcodedConfiguration}<#else>FEATURE.withConfiguration(<#if nonHardcodedConfiguration == "">IFeatureConfig.NO_FEATURE_CONFIG<#else>${nonHardcodedConfiguration}</#if>)</#if><#if data.hasPlacedFeature()>${nonHardcodedPlacement}</#if>;
7474

7575
return FEATURE;
7676
}

src/main/resources/forge-1.15.2/templates/plant/treegrower.java.ftl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,22 @@ public class ${name}TreeGrower extends <#if (data.megaTrees[0]?has_content) || (
3838
if (randomSource.nextFloat() < ${data.secondaryTreeChance}) {
3939
<#if data.flowerTrees[1]?has_content>
4040
if (hasFlower)
41-
return <@toTreeKey data.flowerTrees[1]/>;
41+
return (ConfiguredFeature<TreeFeatureConfig, ?>) (Object) <@toTreeKey data.flowerTrees[1]/>;
4242
</#if>
4343
<#if data.trees[1]?has_content>
44-
return <@toTreeKey data.trees[1]/>;
44+
return (ConfiguredFeature<TreeFeatureConfig, ?>) (Object) <@toTreeKey data.trees[1]/>;
4545
</#if>
4646
}
4747
</#if>
48-
return <#if data.flowerTrees[0]?has_content>hasFlower ? <@toTreeKey data.flowerTrees[0]/> :</#if> <@toTreeKey data.trees[0]/>;
48+
return <#if data.flowerTrees[0]?has_content>hasFlower ? (ConfiguredFeature<TreeFeatureConfig, ?>) (Object) <@toTreeKey data.flowerTrees[0]/> :</#if> (ConfiguredFeature<TreeFeatureConfig, ?>) (Object) <@toTreeKey data.trees[0]/>;
4949
}
5050

5151
<#if (data.megaTrees[0]?has_content) || (data.megaTrees[1]?has_content)>
5252
protected ConfiguredFeature<HugeTreeFeatureConfig, ?> getHugeTreeFeature(Random randomSource) {
5353
<#if data.megaTrees[1]?has_content && data.secondaryTreeChance != 0>
54-
return (randomSource.nextFloat() < ${data.secondaryTreeChance}) ? <@toTreeKey data.megaTrees[1]/> : <@toTreeKey data.megaTrees[0]/>;
54+
return (randomSource.nextFloat() < ${data.secondaryTreeChance}) ? (ConfiguredFeature<HugeTreeFeatureConfig, ?>) (Object) <@toTreeKey data.megaTrees[1]/> : (ConfiguredFeature<HugeTreeFeatureConfig, ?>) (Object) <@toTreeKey data.megaTrees[0]/>;
5555
<#else>
56-
return <@toTreeKey data.megaTrees[0]/>;
56+
return (ConfiguredFeature<HugeTreeFeatureConfig, ?>) (Object) <@toTreeKey data.megaTrees[0]/>;
5757
</#if>
5858
}
5959
</#if>
@@ -62,7 +62,7 @@ public class ${name}TreeGrower extends <#if (data.megaTrees[0]?has_content) || (
6262
<#-- @formatter:on -->
6363
<#macro toTreeKey tree="">
6464
<#if tree?has_content>
65-
new ${generator.map(tree, "configuredfeatures")}
65+
${generator.map(tree, "configuredfeatures")}
6666
<#else>
6767
null
6868
</#if>

0 commit comments

Comments
 (0)