Skip to content

Commit b0bcfa6

Browse files
committed
Some fixes
1 parent 63be537 commit b0bcfa6

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
_mcreator_map_template: "@NAMEFeature()"
2-
_default: "TreeFeature(NoFeatureConfig::deserialize, false)"
3-
acacia: "SavannaTreeFeature(NoFeatureConfig::deserialize, false)"
2+
_default: "TreeFeature(NoFeatureConfig::deserialize)"
3+
acacia: "SavannaTreeFeature(NoFeatureConfig::deserialize)"
44
bamboo_no_podzol: "BambooFeature(ProbabilityConfig::deserialize)"
55
bamboo_some_podzol: "BambooFeature(new ProbabilityConfig(0.2F))"
66
birch: "BirchTreeFeature(NoFeatureConfig::deserialize, false, false)"
@@ -11,7 +11,7 @@ birch_tall: "BirchTreeFeature(NoFeatureConfig::deserialize, false, true)"
1111
blue_ice: "BlueIceFeature(NoFeatureConfig::deserialize)"
1212
bonus_chest: "BonusChestFeature(NoFeatureConfig::deserialize)"
1313
chorus_plant: "ChorusPlantFeature(NoFeatureConfig::deserialize)"
14-
dark_oak: "DarkOakTreeFeature(NoFeatureConfig::deserialize, false)"
14+
dark_oak: "DarkOakTreeFeature(NoFeatureConfig::deserialize)"
1515
desert_well: "DesertWellsFeature(NoFeatureConfig::deserialize)"
1616
disk_clay: "SphereReplaceFeature(new SphereReplaceConfig(Blocks.CLAY.getDefaultState(), 4, 1, Lists.newArrayList(Blocks.DIRT.getDefaultState(), Blocks.CLAY.getDefaultState())))"
1717
disk_gravel: "SphereReplaceFeature(new SphereReplaceConfig(Blocks.GRAVEL.getDefaultState(), 6, 2, Lists.newArrayList(Blocks.DIRT.getDefaultState(), Blocks.GRASS_BLOCK.getDefaultState())))"
@@ -20,11 +20,11 @@ end_gateway_delayed: "EndGatewayFeature(EndGatewayConfig::deserialize)"
2020
end_gateway_return: "EndGatewayFeature(EndGatewayConfig.func_214702_a(EndDimension.SPAWN, true))"
2121
end_island: "EndIslandFeature(NoFeatureConfig::deserialize)"
2222
end_spike: "EndSpikeFeature(new EndSpikeFeatureConfig(false, ImmutableList.of(), null))"
23-
fancy_oak: "BigTreeFeature(NoFeatureConfig::deserialize, false)"
24-
fancy_oak_bees: "BigTreeFeature(NoFeatureConfig::deserialize, false)"
25-
fancy_oak_bees_0002: "BigTreeFeature(NoFeatureConfig::deserialize, false)"
26-
fancy_oak_bees_002: "BigTreeFeature(NoFeatureConfig::deserialize, false)"
27-
fancy_oak_bees_005: "BigTreeFeature(NoFeatureConfig::deserialize, false)"
23+
fancy_oak: "BigTreeFeature(NoFeatureConfig::deserialize)"
24+
fancy_oak_bees: "BigTreeFeature(NoFeatureConfig::deserialize)"
25+
fancy_oak_bees_0002: "BigTreeFeature(NoFeatureConfig::deserialize)"
26+
fancy_oak_bees_002: "BigTreeFeature(NoFeatureConfig::deserialize)"
27+
fancy_oak_bees_005: "BigTreeFeature(NoFeatureConfig::deserialize)"
2828
flower_default: "DefaultFlowersFeature(NoFeatureConfig::deserialize)"
2929
flower_flower_forest: "ForestFlowersFeature(NoFeatureConfig::deserialize)"
3030
flower_meadow: "PlainsFlowersFeature(NoFeatureConfig::deserialize)"
@@ -47,15 +47,15 @@ jungle_tree: "JungleTreeFeature(NoFeatureConfig::deserialize, false, 4, Blocks.J
4747
jungle_tree_no_vine: "JungleTreeFeature(NoFeatureConfig::deserialize, false, 4, Blocks.JUNGLE_LOG.getDefaultState(), Blocks.JUNGLE_LEAVES.getDefaultState(), false)"
4848
kelp: "KelpFeature(NoFeatureConfig::deserialize)"
4949
lake_lava: "LakesFeature(LakesConfig::deserialize)"
50-
meadow_trees: "TreeFeature(NoFeatureConfig::deserialize, false)"
50+
meadow_trees: "TreeFeature(NoFeatureConfig::deserialize)"
5151
mega_jungle_tree: "MegaJungleFeature(NoFeatureConfig::deserialize, false, 10, 20, Blocks.JUNGLE_LOG.getDefaultState(), Blocks.JUNGLE_LEAVES.getDefaultState())"
5252
mega_pine: "MegaPineTree(NoFeatureConfig::deserialize, false, false)"
5353
mega_spruce: "MegaPineTree(NoFeatureConfig::deserialize, false, true)"
5454
monster_room: "DungeonsFeature(NoFeatureConfig::deserialize)"
55-
oak: "TreeFeature(NoFeatureConfig::deserialize, false)"
56-
oak_bees_0002: "TreeFeature(NoFeatureConfig::deserialize, false)"
57-
oak_bees_002: "TreeFeature(NoFeatureConfig::deserialize, false)"
58-
oak_bees_005: "TreeFeature(NoFeatureConfig::deserialize, false)"
55+
oak: "TreeFeature(NoFeatureConfig::deserialize)"
56+
oak_bees_0002: "TreeFeature(NoFeatureConfig::deserialize)"
57+
oak_bees_002: "TreeFeature(NoFeatureConfig::deserialize)"
58+
oak_bees_005: "TreeFeature(NoFeatureConfig::deserialize)"
5959
ore_andesite: "OreFeature(new OreFeatureConfig(OreFeatureConfig.FillerBlockType.NATURAL_STONE, Blocks.ANDESITE.getDefaultState(), 33))"
6060
ore_coal: "OreFeature(new OreFeatureConfig(OreFeatureConfig.FillerBlockType.NATURAL_STONE, Blocks.COAL_ORE.getDefaultState(), 17))"
6161
ore_coal_buried: "OreFeature(new OreFeatureConfig(OreFeatureConfig.FillerBlockType.NATURAL_STONE, Blocks.COAL_ORE.getDefaultState(), 17))"
@@ -113,9 +113,9 @@ spring_lava_overworld: "SpringFeature(new LiquidsConfig(Fluids.LAVA.getDefaultSt
113113
spring_nether_closed: "NetherSpringFeature(new HellLavaConfig(false))"
114114
spring_nether_open: "NetherSpringFeature(new HellLavaConfig(true))"
115115
spring_water: "SpringFeature(LiquidsConfig::deserialize)"
116-
spruce: "TallTaigaTreeFeature(NoFeatureConfig::deserialize, false)"
117-
super_birch_bees: "TallTaigaTreeFeature(NoFeatureConfig::deserialize, false)"
118-
super_birch_bees_0002: "TallTaigaTreeFeature(NoFeatureConfig::deserialize, false)"
116+
spruce: "TallTaigaTreeFeature(NoFeatureConfig::deserialize)"
117+
super_birch_bees: "TallTaigaTreeFeature(NoFeatureConfig::deserialize)"
118+
super_birch_bees_0002: "TallTaigaTreeFeature(NoFeatureConfig::deserialize)"
119119
swamp_oak: "SwampTreeFeature(NoFeatureConfig::deserialize)"
120120
underwater_magma: "OreFeature(new OreFeatureConfig(OreFeatureConfig.FillerBlockType.NATURAL_STONE, Blocks.MAGMA_BLOCK.getDefaultState(), 33))"
121121
vines: "VinesFeature(NoFeatureConfig::deserialize)"

src/main/resources/forge-1.15.2/procedures/place_schematic.java.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if (world instanceof ServerWorld) {
66
template.addBlocksToWorld(world,
77
${toBlockPos(input$x,input$y,input$z)},
88
new PlacementSettings()
9-
.setRotation(Rotation.<#if (field$rotation!'NONE') != "RANDOM">${field$rotation!'NONE'}<#else>func_222466_a(world.getWorld().rand)</#if>)
9+
.setRotation(Rotation.<#if (field$rotation!'NONE') != "RANDOM">${field$rotation!'NONE'}<#else>randomRotation(world.getWorld().rand)</#if>)
1010
.setMirror(Mirror.<#if (field$mirror!'NONE') != "RANDOM">${field$mirror!'NONE'}<#else>values()[world.getWorld().rand.nextInt(2)]</#if>)
1111
.setIgnoreEntities(false), 3);
1212
}

0 commit comments

Comments
 (0)