Merge pull request #19 from gottsch/1.2.0

1.2.0
gottsch · Nov 30, 2018 · 800d4c3 · 800d4c3
2 parents bb5084a + f53f6e5
commit 800d4c3
Show file tree

Hide file tree

Showing 108 changed files with 2,996 additions and 487 deletions.
diff --git a/Treasure2-1.12.2/gradle.properties b/Treasure2-1.12.2/gradle.properties
@@ -6,7 +6,7 @@ mod_name=Treasure2
 package_group=someguyssoftware.treasure2
 # user alpha, beta, or v (for version)
 mod_version_type=v
-mod_version=1.1.0
+mod_version=1.2.0
 
 mc_version=1.12.2
 forge_version=14.23.5.2768

diff --git a/Treasure2-1.12.2/models/SkullChest.tcn b/Treasure2-1.12.2/models/SkullChest.tcn
diff --git a/Treasure2-1.12.2/models/SkullChest2.tcn b/Treasure2-1.12.2/models/SkullChest2.tcn
diff --git a/Treasure2-1.12.2/models/SkullChestModel.java b/Treasure2-1.12.2/models/SkullChestModel.java
@@ -0,0 +1,75 @@
+// Date: 11/26/2018 9:30:45 PM
+// Template version 1.1
+// Java generated by Techne
+// Keep in mind that you still need to fill in some blanks
+// - ZeuX
+
+
+
+
+
+
+package net.minecraft.src;
+
+public class ModelSkullChestModel extends ModelBase
+{
+  //fields
+    ModelRenderer top;
+    ModelRenderer lid;
+    ModelRenderer jaw;
+    ModelRenderer head;
+
+  public ModelSkullChestModel()
+  {
+    textureWidth = 128;
+    textureHeight = 128;
+
+      top = new ModelRenderer(this, 0, 0);
+      top.addBox(-6F, -1F, -13F, 12, 1, 12);
+      top.setRotationPoint(0F, 9F, 7F);
+      top.setTextureSize(128, 128);
+      top.mirror = true;
+      setRotation(top, 0F, 0F, 0F);
+      lid = new ModelRenderer(this, 0, 15);
+      lid.addBox(-7F, 0F, -14F, 14, 1, 14);
+      lid.setRotationPoint(0F, 9F, 7F);
+      lid.setTextureSize(128, 128);
+      lid.mirror = true;
+      setRotation(lid, 0F, 0F, 0F);
+      jaw = new ModelRenderer(this, 0, 56);
+      jaw.addBox(-5F, 0F, -7F, 10, 6, 9);
+      jaw.setRotationPoint(0F, 18F, 0F);
+      jaw.setTextureSize(128, 128);
+      jaw.mirror = true;
+      setRotation(jaw, 0F, 0F, 0F);
+      head = new ModelRenderer(this, 0, 32);
+      head.addBox(-7F, 0F, -14F, 14, 8, 14);
+      head.setRotationPoint(0F, 10F, 7F);
+      head.setTextureSize(128, 128);
+      head.mirror = true;
+      setRotation(head, 0F, 0F, 0F);
+  }
+
+  public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
+  {
+    super.render(entity, f, f1, f2, f3, f4, f5);
+    setRotationAngles(f, f1, f2, f3, f4, f5, entity);
+    top.render(f5);
+    lid.render(f5);
+    jaw.render(f5);
+    head.render(f5);
+  }
+
+  private void setRotation(ModelRenderer model, float x, float y, float z)
+  {
+    model.rotateAngleX = x;
+    model.rotateAngleY = y;
+    model.rotateAngleZ = z;
+  }
+
+  public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity)
+  {
+    super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
+  }
+
+}
diff --git a/Treasure2-1.12.2/models/SkullChestModel2.java b/Treasure2-1.12.2/models/SkullChestModel2.java
diff --git a/Treasure2-1.12.2/models/skull-chest.png b/Treasure2-1.12.2/models/skull-chest.png
diff --git a/Treasure2-1.12.2/models/skull-chest2.png b/Treasure2-1.12.2/models/skull-chest2.png
diff --git a/Treasure2-1.12.2/models/skull-chest3.png b/Treasure2-1.12.2/models/skull-chest3.png
diff --git a/Treasure2-1.12.2/src/com/someguyssoftware/treasure2/Treasure.java b/Treasure2-1.12.2/src/com/someguyssoftware/treasure2/Treasure.java
@@ -17,6 +17,7 @@
 import com.someguyssoftware.gottschcore.mod.AbstractMod;
 import com.someguyssoftware.gottschcore.mod.IMod;
 import com.someguyssoftware.gottschcore.version.BuildVersion;
+import com.someguyssoftware.treasure2.block.TreasureBlocks;
 import com.someguyssoftware.treasure2.client.gui.GuiHandler;
 import com.someguyssoftware.treasure2.command.SpawnPitCommand;
 import com.someguyssoftware.treasure2.command.SpawnPitOnlyCommand;
@@ -29,7 +30,10 @@
 import com.someguyssoftware.treasure2.eventhandler.MimicEventHandler;
 import com.someguyssoftware.treasure2.eventhandler.PlayerEventHandler;
 import com.someguyssoftware.treasure2.eventhandler.WorldEventHandler;
+import com.someguyssoftware.treasure2.item.PaintingItem;
 import com.someguyssoftware.treasure2.item.TreasureItems;
+import com.someguyssoftware.treasure2.loot.conditions.ModPresent;
+import com.someguyssoftware.treasure2.loot.conditions.TreasureLootConditionManager;
 import com.someguyssoftware.treasure2.worldgen.ChestWorldGenerator;
 import com.someguyssoftware.treasure2.worldgen.WellWorldGenerator;
 import com.someguyssoftware.treasure2.worldgen.WitherTreeWorldGenerator;
@@ -74,7 +78,7 @@ public class Treasure extends AbstractMod {
 	// constants
 	public static final String MODID = "treasure2";
 	protected static final String NAME = "Treasure2";
-	protected static final String VERSION = "1.1.0";
+	protected static final String VERSION = "1.2.0";
 	public static final String UPDATE_JSON_URL = "https://raw.githubusercontent.com/gottsch/gottsch-minecraft-Treasure/master/Treasure2-1.12.2/update.json";
 
 	private static final String VERSION_URL = "";
@@ -178,6 +182,9 @@ public void init(FMLInitializationEvent event) {
 
 		super.init(event);
 
+		// register custom loot conditions
+//		TreasureLootConditionManager.registerCondition(new ModPresent.Serializer());
+
 		// register world generators
 		worldGenerators.put("chest", new ChestWorldGenerator());
 		worldGenerators.put("well", new WellWorldGenerator());
@@ -197,6 +204,23 @@ public void postInit(FMLPostInitializationEvent event) {
 
 		// perform any post init
 		super.postInit(event);
+
+		// associate painting items to painting blocks and vice versa
+		((PaintingItem)TreasureItems.PAINTING_BLOCKS_BRICKS).setPaintingBlock(TreasureBlocks.PAINTING_BLOCKS_BRICKS);
+		((PaintingItem)TreasureItems.PAINTING_BLOCKS_COBBLESTONE).setPaintingBlock(TreasureBlocks.PAINTING_BLOCKS_COBBLESTONE);
+		((PaintingItem)TreasureItems.PAINTING_BLOCKS_DIRT).setPaintingBlock(TreasureBlocks.PAINTING_BLOCKS_DIRT);
+		((PaintingItem)TreasureItems.PAINTING_BLOCKS_LAVA).setPaintingBlock(TreasureBlocks.PAINTING_BLOCKS_LAVA);
+		((PaintingItem)TreasureItems.PAINTING_BLOCKS_SAND).setPaintingBlock(TreasureBlocks.PAINTING_BLOCKS_SAND);
+		((PaintingItem)TreasureItems.PAINTING_BLOCKS_WATER).setPaintingBlock(TreasureBlocks.PAINTING_BLOCKS_WATER);
+		((PaintingItem)TreasureItems.PAINTING_BLOCKS_WOOD).setPaintingBlock(TreasureBlocks.PAINTING_BLOCKS_WOOD);
+
+		TreasureBlocks.PAINTING_BLOCKS_BRICKS.setItem((PaintingItem) TreasureItems.PAINTING_BLOCKS_BRICKS);
+		TreasureBlocks.PAINTING_BLOCKS_COBBLESTONE.setItem((PaintingItem) TreasureItems.PAINTING_BLOCKS_COBBLESTONE);
+		TreasureBlocks.PAINTING_BLOCKS_DIRT.setItem((PaintingItem) TreasureItems.PAINTING_BLOCKS_DIRT);
+		TreasureBlocks.PAINTING_BLOCKS_LAVA.setItem((PaintingItem) TreasureItems.PAINTING_BLOCKS_LAVA);
+		TreasureBlocks.PAINTING_BLOCKS_SAND.setItem((PaintingItem) TreasureItems.PAINTING_BLOCKS_SAND);
+		TreasureBlocks.PAINTING_BLOCKS_WATER.setItem((PaintingItem) TreasureItems.PAINTING_BLOCKS_WATER);
+		TreasureBlocks.PAINTING_BLOCKS_WOOD.setItem((PaintingItem) TreasureItems.PAINTING_BLOCKS_WOOD);
 	}
 
 	/* (non-Javadoc)

diff --git a/Treasure2-1.12.2/src/com/someguyssoftware/treasure2/block/AbstractChestBlock.java b/Treasure2-1.12.2/src/com/someguyssoftware/treasure2/block/AbstractChestBlock.java
@@ -154,6 +154,11 @@ public boolean isFullCube(IBlockState state) {
 		return false;
 	}
 
+	@Override
+	public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) {
+		return false;
+	}
+
 	/**
 	 * Render using a TESR.
 	 */