Additional sand layer checks. Closes #216

TeamMetallurgy · Nov 19, 2020 · 52946f7 · 52946f7
1 parent f9b308a
commit 52946f7
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 minecraft_version=1.12.2
 forge_version=14.23.5.2847
 mappings_version=stable_39
-mod_version=2.0.19
+mod_version=2.0.20
 api_version=0.0.2
 jei_version=4.15.0.293
 hwyla_version=1.8.26-B41

diff --git a/src/main/java/com/teammetallurgy/atum/blocks/machines/tileentity/TileEntityKiln.java b/src/main/java/com/teammetallurgy/atum/blocks/machines/tileentity/TileEntityKiln.java
@@ -232,7 +232,7 @@ public static boolean canKilnNotSmelt(@Nonnull ItemStack stack) {
 
         String oreName = "";
         for (int oreId : OreDictionary.getOreIDs(stack)) {
-            oreName = OreDictionary.getOreName(oreId).toLowerCase(Locale.ENGLISH);
+            oreName = OreDictionary.getOreName(oreId).toLowerCase(Locale.ROOT);
         }
         return RecipeHandlers.kilnBlacklist.contains(item.getRegistryName()) || RecipeHandlers.kilnBlacklist.contains(block.getRegistryName()) ||
                 item instanceof ItemFood || block instanceof BlockOre || item instanceof ItemCoal ||

diff --git a/src/main/java/com/teammetallurgy/atum/blocks/stone/ceramic/BlockCeramic.java b/src/main/java/com/teammetallurgy/atum/blocks/stone/ceramic/BlockCeramic.java
@@ -12,6 +12,7 @@
 import net.minecraft.world.IBlockAccess;
 
 import javax.annotation.Nonnull;
+import java.util.Locale;
 import java.util.Map;
 
 public class BlockCeramic extends Block {
@@ -39,7 +40,7 @@ public static Block getCeramicBlocks(EnumDyeColor color) {
     @Override
     @Nonnull
     public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos) {
-        return MapColor.getBlockColor(EnumDyeColor.valueOf(getColorString().toUpperCase()));
+        return MapColor.getBlockColor(EnumDyeColor.valueOf(getColorString().toUpperCase(Locale.ROOT)));
     }
 
     private String getColorString() {

diff --git a/src/main/java/com/teammetallurgy/atum/blocks/stone/ceramic/BlockCeramicSlab.java b/src/main/java/com/teammetallurgy/atum/blocks/stone/ceramic/BlockCeramicSlab.java
@@ -15,6 +15,7 @@
 import net.minecraft.world.IBlockAccess;
 
 import javax.annotation.Nonnull;
+import java.util.Locale;
 import java.util.Map;
 
 public class BlockCeramicSlab extends BlockAtumSlab {
@@ -42,7 +43,7 @@ public static Block getSlab(EnumDyeColor color) {
     @Override
     @Nonnull
     public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos) {
-        return MapColor.getBlockColor(EnumDyeColor.valueOf(getColorString().toUpperCase()));
+        return MapColor.getBlockColor(EnumDyeColor.valueOf(getColorString().toUpperCase(Locale.ROOT)));
     }
 
     private String getColorString() {

diff --git a/src/main/java/com/teammetallurgy/atum/entity/animal/EntityCamel.java b/src/main/java/com/teammetallurgy/atum/entity/animal/EntityCamel.java
@@ -50,6 +50,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.Locale;
 import java.util.UUID;
 
 public class EntityCamel extends AbstractHorse implements IRangedAttackMob {
@@ -380,7 +381,7 @@ private void setColorByItem(@Nonnull ItemStack stack) {
                 this.setColor(EnumDyeColor.byMetadata(stack.getMetadata()));
             } else if (Block.getBlockFromItem(stack.getItem()) instanceof BlockLinenCarpet) {
                 BlockLinenCarpet linenCarpet = (BlockLinenCarpet) Block.getBlockFromItem(stack.getItem());
-                this.setColor(EnumDyeColor.valueOf(linenCarpet.getColorString().toUpperCase()));
+                this.setColor(EnumDyeColor.valueOf(linenCarpet.getColorString().toUpperCase(Locale.ROOT)));
             }
         } else {
             this.setColor(null);

diff --git a/src/main/java/com/teammetallurgy/atum/entity/undead/EntityPharaoh.java b/src/main/java/com/teammetallurgy/atum/entity/undead/EntityPharaoh.java
@@ -247,7 +247,7 @@ public String getName() {
         int p = this.dataManager.get(PREFIX);
         int s = this.dataManager.get(SUFFIX);
         int n = this.dataManager.get(NUMERAL);
-        return "Pharaoh " + AtumUtils.format("entity.atum.pharaoh." + prefixArray[p]) + AtumUtils.format("entity.atum.pharaoh." + suffixArray[s].toLowerCase(Locale.ENGLISH)) + " " + numeralArray[n];
+        return "Pharaoh " + AtumUtils.format("entity.atum.pharaoh." + prefixArray[p]) + AtumUtils.format("entity.atum.pharaoh." + suffixArray[s].toLowerCase(Locale.ROOT)) + " " + numeralArray[n];
     }
 
     @Override

diff --git a/src/main/java/com/teammetallurgy/atum/world/ChunkGeneratorAtum.java b/src/main/java/com/teammetallurgy/atum/world/ChunkGeneratorAtum.java
@@ -379,7 +379,10 @@ public void populate(int x, int z) {
 
     static boolean canPlaceSandLayer(World world, BlockPos pos, Biome biome) {
         IBlockState stateDown = world.getBlockState(pos.down());
-        return biome != AtumBiomes.OASIS
+        IBlockState state = world.getBlockState(pos);
+        IBlockState stateUp = world.getBlockState(pos.up());
+        return state.getBlock().isReplaceable(world, pos) && stateUp.getBlock().isReplaceable(world, pos.up())
+                && biome != AtumBiomes.OASIS
                 && stateDown.getBlock() != AtumBlocks.LIMESTONE_CRACKED
                 && stateDown.isSideSolid(world, pos, EnumFacing.UP)
                 && !(stateDown.getBlock() instanceof BlockSandLayers)