From f12283aea4cd6f12961c567e5608c1fe00d42882 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 12 Feb 2020 11:37:25 -0400 Subject: [PATCH] good to set your priorities straight --- gradle.properties | 4 ++-- src/main/java/carpet/CarpetSettings.java | 2 +- src/main/java/carpet/helpers/FeatureGenerator.java | 10 +++++----- src/main/java/carpet/helpers/OptimizedExplosion.java | 4 ++-- src/main/resources/fabric.mod.json | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gradle.properties b/gradle.properties index cc4f259a..0336c0a2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,11 +5,11 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html minecraft_version=1.15.2 - yarn_mappings=1.15.2+build.12 + yarn_mappings=1.15.2+build.14 loader_version=0.7.8+build.184 # Mod Properties - mod_version = 1.3.9+v200206b + mod_version = 1.3.10+v200212 maven_group = carpet archives_base_name = fabric-carpet diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 0110289c..3524576f 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -32,7 +32,7 @@ import static carpet.settings.RuleCategory.DISPENSER; @SuppressWarnings("CanBeFinal") public class CarpetSettings { - public static final String carpetVersion = "1.3.9+v200206b"; + public static final String carpetVersion = "1.3.10+v200212"; public static final Logger LOG = LogManager.getLogger(); public static boolean skipGenerationChecks = false; public static boolean impendingFillSkipUpdates = false; diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index 3a9132dc..eb8caf20 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -35,7 +35,7 @@ import net.minecraft.world.gen.feature.ShipwreckFeatureConfig; import net.minecraft.world.gen.feature.StructureFeature; import net.minecraft.world.gen.feature.VillageFeatureConfig; import net.minecraft.world.gen.foliage.BlobFoliagePlacer; -import net.minecraft.world.gen.stateprovider.SimpleStateProvider; +import net.minecraft.world.gen.stateprovider.SimpleBlockStateProvider; import java.util.Arrays; import java.util.Collections; @@ -213,8 +213,8 @@ public class FeatureGenerator put("oak", simpleTree(DefaultBiomeFeatures.OAK_TREE_CONFIG)); put("oak_beehive", simpleTree( (new BranchedTreeFeatureConfig.Builder( - new SimpleStateProvider(Blocks.OAK_LOG.getDefaultState()), - new SimpleStateProvider(Blocks.OAK_LEAVES.getDefaultState()), + new SimpleBlockStateProvider(Blocks.OAK_LOG.getDefaultState()), + new SimpleBlockStateProvider(Blocks.OAK_LEAVES.getDefaultState()), new BlobFoliagePlacer(2, 0)) ).baseHeight(4).heightRandA(2).foliageHeight(3).noVines() .treeDecorators(ImmutableList.of(new BeehiveTreeDecorator(1.0F))).build() @@ -222,8 +222,8 @@ public class FeatureGenerator put("oak_large", simplePlop(Feature.FANCY_TREE.configure(DefaultBiomeFeatures.FANCY_TREE_CONFIG))); put("oak_large_beehive", simplePlop(Feature.FANCY_TREE.configure( (new BranchedTreeFeatureConfig.Builder( - new SimpleStateProvider(Blocks.OAK_LOG.getDefaultState()), - new SimpleStateProvider(Blocks.OAK_LEAVES.getDefaultState()), + new SimpleBlockStateProvider(Blocks.OAK_LOG.getDefaultState()), + new SimpleBlockStateProvider(Blocks.OAK_LEAVES.getDefaultState()), new BlobFoliagePlacer(0, 0)) ).treeDecorators(ImmutableList.of(new BeehiveTreeDecorator(1.0F))).build() ))); diff --git a/src/main/java/carpet/helpers/OptimizedExplosion.java b/src/main/java/carpet/helpers/OptimizedExplosion.java index e5352b27..a0eb7838 100644 --- a/src/main/java/carpet/helpers/OptimizedExplosion.java +++ b/src/main/java/carpet/helpers/OptimizedExplosion.java @@ -288,8 +288,8 @@ public class OptimizedExplosion for(int j = 0; j < i; ++j) { Pair pair = (Pair)objectArrayList.get(j); ItemStack itemStack2 = pair.getLeft(); - if (ItemEntity.method_24017(itemStack2, itemStack)) { - ItemStack itemStack3 = ItemEntity.method_24018(itemStack2, itemStack, 16); + if (ItemEntity.canMerge(itemStack2, itemStack)) { + ItemStack itemStack3 = ItemEntity.merge(itemStack2, itemStack, 16); objectArrayList.set(j, Pair.of(itemStack3, pair.getRight())); if (itemStack.isEmpty()) { return; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b8e0eb17..10d6a1a9 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "carpet", - "version": "1.3.9", + "version": "1.3.10", "name": "Carpet Mod in Fabric", "description": "Carpet made out of fabric",