New Campfire, Temperature Rendering, Drink Stacking

New campfire model by fonnymunkey
New frost rod / powder textures by Artsy
Tweaked campfire particles slightly
Moved temperature rendering to All phase
Drinks are stackable to 8 now
Removed anvil handler as it's no longer necessary
Bump gradle, updated contributors

CONTRIBUTORS.txt

@@ -4,7 +4,8 @@ List of contributors
 Charles445 - anything not specified below
 
  - Assets - 
-Artsydgy/Artsydy - Temperature HUD Textures, Cloth Armor Item Textures, Cloth Armor Model Textures
+Artsydgy/Artsydy - Temperature HUD Textures, Cloth Armor Item Textures, Cloth Armor Model Textures, Frost Powder/Rod Textures
+fonnymunkey - Campfire Model
 HoontsArt - Dragon Canteen Textures, Iron Canteen Textures, Thermometer Textures
 Shivaxi - Thirst HUD Textures
 tehmadtitaan - Ice Armor Model Textures, Cloth Armor Model Textures

build.gradle

@@ -10,7 +10,7 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle.forge'
 
 
-version = "1.12.2-0.3.6"
+version = "1.12.2-0.3.7"
 group = "com.charles445.simpledifficulty" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "SimpleDifficulty"
 

src/main/java/com/charles445/simpledifficulty/block/BlockCampfire.java

@@ -49,7 +49,7 @@ public class BlockCampfire extends Block implements IBlockStateIgnore
 	public static final PropertyBool BURNING = PropertyBool.create("burning");
 
 	private static final IProperty[] ignoredProperties = new IProperty[]{BURNING};
-	private static final AxisAlignedBB HITBOX = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.25D, 1.0D);
+	private static final AxisAlignedBB HITBOX = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.4D, 1.0D); //Old is 0.25D for height
 
 	public BlockCampfire()
 	{
@@ -325,7 +325,7 @@ private void createFlameParticle(World world, BlockPos pos, Random rand)
 
 
 
-		world.spawnParticle(EnumParticleTypes.FLAME, xOffset + pos.getX(), yOffset + pos.getY(), zOffset + pos.getZ(), 0.0d, rand.nextDouble() * 0.015d, 0.0d);
+		world.spawnParticle(EnumParticleTypes.FLAME, xOffset + pos.getX(), yOffset + pos.getY(), zOffset + pos.getZ(), 0.0d, (rand.nextDouble() * 0.015d) + 0.005d, 0.0d);
 	}
 
 	@Override

src/main/java/com/charles445/simpledifficulty/client/gui/TemperatureGui.java

@@ -77,7 +77,7 @@ public class TemperatureGui
 	@SubscribeEvent
 	public void onPreRenderGameOverlay(RenderGameOverlayEvent.Pre event)
 	{
-		if(event.getType()==ElementType.EXPERIENCE && QuickConfig.isTemperatureEnabled() && mc.playerController.gameIsSurvivalOrAdventure())
+		if(event.getType()==ElementType.ALL && QuickConfig.isTemperatureEnabled() && mc.playerController.gameIsSurvivalOrAdventure())
 		{
 			//Set the seed to avoid shaking during pausing
 			rand.setSeed((long)(updateCounter * 445));

src/main/java/com/charles445/simpledifficulty/handler/MiscHandler.java

@@ -36,12 +36,15 @@ public void onDismount(EntityMountEvent event)
 	}
 
 	//Prevent canteens from being repaired in the anvil
+	//Canteens don't use damage anymore so this is no longer necessary
+	/*
 	@SubscribeEvent
 	public void onAnvilUpdate(AnvilUpdateEvent event)
 	{
 		if(event.getLeft().getItem() == SDItems.canteen || event.getRight().getItem() == SDItems.canteen)
-			event.setCanceled(true);
+			event.setOutput(ItemStack.EMPTY);
 	}
+	*/
 
 
 

src/main/java/com/charles445/simpledifficulty/handler/ThirstHandler.java

@@ -186,7 +186,7 @@ public void onRightClickBlock(PlayerInteractEvent.RightClickBlock event)
 						}
 					}
 				}
-				else if(heldItem.getItem() == SDItems.canteen)
+				else if(heldItem.getItem() instanceof IItemCanteen)
 				{
 					//TODO this is janky and probably not the right place for it anyway
 
@@ -199,17 +199,14 @@ else if(heldItem.getItem() == SDItems.canteen)
 						int level = state.getValue(BlockCauldron.LEVEL);
 						if(level > 0)
 						{
-							if(heldItem.getItem() instanceof IItemCanteen)
+							IItemCanteen canteen = (IItemCanteen) heldItem.getItem();
+
+							if(canteen.tryAddDose(heldItem,ThirstEnum.NORMAL))
 							{
-								IItemCanteen canteen = (IItemCanteen) heldItem.getItem();
+								SoundUtil.serverPlayBlockSound(world, pos, SoundEvents.ITEM_BUCKET_FILL);
 
-								if(canteen.tryAddDose(heldItem,ThirstEnum.NORMAL))
-								{
-									SoundUtil.serverPlayBlockSound(world, pos, SoundEvents.ITEM_BUCKET_FILL);
-
-									//TODO Auto drink bug is present when using canteens on cauldrons
-									//Not sure how to fix, stop active hand and the scheduled variant don't seem to work
-								}
+								//TODO Auto drink bug is present when using canteens on cauldrons
+								//Not sure how to fix, stop active hand and the scheduled variant don't seem to work
 							}
 						}
 					}

src/main/java/com/charles445/simpledifficulty/item/ItemDrinkBase.java

@@ -29,7 +29,7 @@ public abstract class ItemDrinkBase extends Item
 	public ItemDrinkBase()
 	{
 		this.setMaxDamage(0);
-		this.setMaxStackSize(1);
+		this.setMaxStackSize(8);
 	}
 
 	public void runSecondaryEffect(EntityPlayer player, ItemStack stack)

src/main/java/com/charles445/simpledifficulty/util/QuadConsumer.java

@@ -0,0 +1,9 @@
+package com.charles445.simpledifficulty.util;
+
+import java.util.Objects;
+
+@FunctionalInterface
+public interface QuadConsumer<A, B, C, D>
+{
+	void accept(A a, B b, C c, D d);
+}

src/main/java/com/charles445/simpledifficulty/util/TriConsumer.java

@@ -0,0 +1,9 @@
+package com.charles445.simpledifficulty.util;
+
+import java.util.Objects;
+
+@FunctionalInterface
+public interface TriConsumer<A, B, C>
+{
+	void accept(A a, B b, C c);
+}