icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

good to set your priorities straight

Browse Source
This commit is contained in:
gnembon committed 2020-02-12 11:37:25 -04:00
1 parent 8f59cc5402
commit f12283aea4
5 files changed
+11 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/CarpetSettings.java
+1 -1
View File
@@ -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;
src/main/java/carpet/helpers/FeatureGenerator.java
+5 -5
View File
@@ -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()
)));
src/main/java/carpet/helpers/OptimizedExplosion.java
+2 -2
View File
@@ -288,8 +288,8 @@ public class OptimizedExplosion
for(int j = 0; j < i; ++j) {
Pair<ItemStack, BlockPos> 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;