v0.9

- Added the remaining textures needed - Mob chips now have different rf/t simulation costs in the - Added charred redstone/plates to avoid mod recipe collisions - Added more transmution recipes - Data model leveling tweaked to be easier
xt9 · Dec 26, 2017 · 7de5a7b · 7de5a7b
1 parent a14b85f
commit 7de5a7b
Show file tree

Hide file tree

Showing 67 changed files with 268 additions and 63 deletions.
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 
 def mcVersion = "1.12.2"
 def modMajor = "0"
-def modMinor = "8"
+def modMinor = "9"
 
 version = "${mcVersion}-${modMajor}.${modMinor}"
 group = "xt9.deepmoblearning" // http://maven.apache.org/guides/mini/guide-naming-conventions.html

diff --git a/changelog.md b/changelog.md
@@ -1,2 +1,3 @@
-# 1.11.2
-## 0.1
+# 1.12.2
+## 0.9
+First beta version.
diff --git a/src/main/java/xt9/deepmoblearning/client/gui/ChipExperienceGui.java b/src/main/java/xt9/deepmoblearning/client/gui/ChipExperienceGui.java
@@ -68,7 +68,7 @@ public void onRenderExperienceBar(RenderGameOverlayEvent.Post event) {
             this.chipStackList = ItemMobChip.getValidFromList(ItemDeepLearner.getContainedItems(this.deepLearner));
         }
 
-        // Todo Option for left/right gui or disable it entirely
+        // Todo [NOT Urgent] Option for left/right gui or disable it entirely
         int x = getRightCornerX();
         int y = 5;
 

diff --git a/src/main/java/xt9/deepmoblearning/client/gui/SimulationChamberGui.java b/src/main/java/xt9/deepmoblearning/client/gui/SimulationChamberGui.java
@@ -6,6 +6,7 @@
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
@@ -77,15 +78,21 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
             if(13 <= x && x < 22) {
                 // Tooltip for Chip exp bar
                 if(this.itemHandler.hasChip()) {
-                    tooltip.add(ItemMobChip.getCurrentTierSimulationCountWithKills(this.itemHandler.getChip()) + "/" + ItemMobChip.getTierRoof(this.itemHandler.getChip()) + " Data collected");
+                    if(ItemMobChip.getTier(this.itemHandler.getChip()) != DeepConstants.MOB_CHIP_MAXIMUM_TIER) {
+                        tooltip.add(ItemMobChip.getCurrentTierSimulationCountWithKills(this.itemHandler.getChip()) + "/" + ItemMobChip.getTierRoof(this.itemHandler.getChip()) + " Data collected");
+                    } else {
+                        tooltip.add("This data model has reached the max tier.");
+                    }
                 } else {
                     tooltip.add("Machine is missing a data model");
                 }
                 drawHoveringText(tooltip, x + 2, y + 2);
             } else if(211 <= x && x < 220) {
                 tooltip.add(f.format(this.energyStorage.getEnergyStored()) + "/" + f.format(this.energyStorage.getMaxEnergyStored()) + " RF");
-                tooltip.add("Machine in use drains 128RF/t");
-                drawHoveringText(tooltip, x + 2, y + 2);
+                if(this.itemHandler.hasChip()) {
+                    tooltip.add("Simulations with current data model drains " + f.format(ItemMobChip.getMobMetaData(this.itemHandler.getChip()).getSimulationTickCost()) + "RF/t");
+                }
+                drawHoveringText(tooltip, x - 90, y - 16);
             }
         }
     }

diff --git a/src/main/java/xt9/deepmoblearning/common/Registry.java b/src/main/java/xt9/deepmoblearning/common/Registry.java
@@ -18,6 +18,8 @@ public class Registry {
 
     public static NonNullList<ItemBase> items = NonNullList.create();
     public static ItemPolymerClay polymerClay;
+    public static ItemCharredRedstone charredRedstone;
+    public static ItemCharredPlate charredPlate;
     public static ItemLivingMatter livingMatter;
     public static ItemPristineMatter pristineMatter;
     public static ItemDeepLearner deepLearner;
@@ -39,12 +41,16 @@ public static void registerItems(IForgeRegistry registry) {
         simulationChamber = new ItemBlock(blockSimulationChamber).setRegistryName(blockSimulationChamber.getRegistryName());
         registry.register(simulationChamber);
 
+        charredRedstone = new ItemCharredRedstone();
+        items.add(charredRedstone);
+        charredPlate = new ItemCharredPlate();
+        items.add(charredPlate);
+        polymerClay = new ItemPolymerClay();
+        items.add(polymerClay);
         deepLearner = new ItemDeepLearner();
         items.add(deepLearner);
         mobChip = new ItemMobChip();
         items.add(mobChip);
-        polymerClay = new ItemPolymerClay();
-        items.add(polymerClay);
         livingMatter = new ItemLivingMatter();
         items.add(livingMatter);
         pristineMatter = new ItemPristineMatter();

diff --git a/src/main/java/xt9/deepmoblearning/common/items/ItemCharredPlate.java b/src/main/java/xt9/deepmoblearning/common/items/ItemCharredPlate.java
@@ -0,0 +1,10 @@
+package xt9.deepmoblearning.common.items;
+
+/**
+ * Created by xt9 on 2017-06-19.
+ */
+public class ItemCharredPlate extends ItemBase {
+    public ItemCharredPlate() {
+        super("charred_plate", 64);
+    }
+}
diff --git a/src/main/java/xt9/deepmoblearning/common/items/ItemCharredRedstone.java b/src/main/java/xt9/deepmoblearning/common/items/ItemCharredRedstone.java
@@ -0,0 +1,10 @@
+package xt9.deepmoblearning.common.items;
+
+/**
+ * Created by xt9 on 2017-06-19.
+ */
+public class ItemCharredRedstone extends ItemBase {
+    public ItemCharredRedstone() {
+        super("charred_redstone", 64);
+    }
+}
diff --git a/src/main/java/xt9/deepmoblearning/common/items/ItemMobChip.java b/src/main/java/xt9/deepmoblearning/common/items/ItemMobChip.java
@@ -40,6 +40,7 @@ public void addInformation(ItemStack stack, @Nullable World worldIn, List<String
                     list.add(I18n.format("deepmoblearning.mob_chip.data.collected", getCurrentTierSimulationCountWithKills(stack), getTierRoof(stack)));
                     list.add(I18n.format("deepmoblearning.mob_chip.data.killmultiplier", DataModelExperience.getKillMultiplier(ItemMobChip.getTier(stack))));
                 }
+                list.add(I18n.format("deepmoblearning.mob_chip.rfcost", getMobMetaData(stack).getSimulationTickCost()));
                 list.add(I18n.format("deepmoblearning.mob_chip.type", getMatterTypeName(stack)));
             }
         }
@@ -161,7 +162,7 @@ public static MobMetaData getMobMetaData(ItemStack stack) {
     }
 
     public static int getPristineChance(ItemStack stack) {
-        // Todo CONFIGURABLE
+        // Todo [Before release] CONFIGURABLE
         switch(getTier(stack)) {
             case 0: return 0;
             case 1: return 3;

diff --git a/src/main/java/xt9/deepmoblearning/common/items/ItemPristineMatter.java b/src/main/java/xt9/deepmoblearning/common/items/ItemPristineMatter.java
@@ -2,6 +2,8 @@
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import xt9.deepmoblearning.DeepConstants;
 
 /**
@@ -26,4 +28,9 @@ public static int getMetaFromKey(String key) {
         }
         return 0;
     }
+
+    @SideOnly(Side.CLIENT)
+    public boolean hasEffect(ItemStack stack) {
+        return true;
+    }
 }
diff --git a/src/main/java/xt9/deepmoblearning/common/mobs/BlazeMeta.java b/src/main/java/xt9/deepmoblearning/common/mobs/BlazeMeta.java
@@ -16,7 +16,6 @@ public class BlazeMeta extends MobMetaData {
 
     public BlazeMeta() {
         super();
-        this.entity = new EntityBlaze(this.world);
     }
 
     public String getMobName() {
@@ -32,6 +31,7 @@ public int getNumberOfHearts() {
     }
 
     public EntityBlaze getEntity() {
+        this.entity = new EntityBlaze(this.world);
         return this.entity;
     }
 
@@ -46,4 +46,6 @@ public int getInterfaceOffsetX() {
     public int getInterfaceOffsetY() {
         return this.interfaceOffsetY;
     }
+
+    public int getSimulationTickCost() { return 256; }
 }
diff --git a/src/main/java/xt9/deepmoblearning/common/mobs/CreeperMeta.java b/src/main/java/xt9/deepmoblearning/common/mobs/CreeperMeta.java
@@ -16,7 +16,6 @@ public class CreeperMeta extends MobMetaData {
 
     public CreeperMeta() {
         super();
-        this.entity = new EntityCreeper(this.world);
     }
 
     public String getMobName() {
@@ -32,6 +31,7 @@ public int getNumberOfHearts() {
     }
 
     public EntityCreeper getEntity() {
+        this.entity = new EntityCreeper(this.world);
         return this.entity;
     }
 
@@ -46,4 +46,6 @@ public int getInterfaceOffsetX() {
     public int getInterfaceOffsetY() {
         return this.interfaceOffsetY;
     }
+
+    public int getSimulationTickCost() { return 80; }
 }
diff --git a/src/main/java/xt9/deepmoblearning/common/mobs/EndermanMeta.java b/src/main/java/xt9/deepmoblearning/common/mobs/EndermanMeta.java
@@ -16,7 +16,6 @@ public class EndermanMeta extends MobMetaData {
 
     public EndermanMeta() {
         super();
-        this.entity = new EntityEnderman(this.world);
     }
 
     public String getMobName() {
@@ -32,6 +31,7 @@ public int getNumberOfHearts() {
     }
 
     public EntityEnderman getEntity() {
+        this.entity = new EntityEnderman(this.world);
         return this.entity;
     }
 
@@ -46,4 +46,6 @@ public int getInterfaceOffsetX() {
     public int getInterfaceOffsetY() {
         return this.interfaceOffsetY;
     }
+
+    public int getSimulationTickCost() { return 512; }
 }
diff --git a/src/main/java/xt9/deepmoblearning/common/mobs/GhastMeta.java b/src/main/java/xt9/deepmoblearning/common/mobs/GhastMeta.java
@@ -16,7 +16,6 @@ public class GhastMeta extends MobMetaData {
 
     public GhastMeta() {
         super();
-        this.entity = new EntityGhast(this.world);
     }
 
     public String getMobName() {
@@ -32,6 +31,7 @@ public int getNumberOfHearts() {
     }
 
     public EntityGhast getEntity() {
+        this.entity = new EntityGhast(this.world);
         return this.entity;
     }
 
@@ -46,4 +46,6 @@ public int getInterfaceOffsetX() {
     public int getInterfaceOffsetY() {
         return this.interfaceOffsetY;
     }
+
+    public int getSimulationTickCost() { return 420; }
 }
diff --git a/src/main/java/xt9/deepmoblearning/common/mobs/MobMetaData.java b/src/main/java/xt9/deepmoblearning/common/mobs/MobMetaData.java
@@ -43,4 +43,6 @@ public ItemStack getPristineMatter(ItemStack parentChip, int amount) {
         matter.setItemDamage(ItemPristineMatter.getMetaFromKey(chipSubName));
         return matter;
     }
+
+    public int getSimulationTickCost() { return 0; }
 }
diff --git a/src/main/java/xt9/deepmoblearning/common/mobs/SkeletonMeta.java b/src/main/java/xt9/deepmoblearning/common/mobs/SkeletonMeta.java
@@ -19,8 +19,6 @@ public class SkeletonMeta extends MobMetaData {
 
     public SkeletonMeta() {
         super();
-        this.entity = new EntitySkeleton(this.world);
-        this.entity.setHeldItem(EnumHand.MAIN_HAND, new ItemStack(Items.BOW));
     }
 
     public String getMobName() {
@@ -36,6 +34,8 @@ public int getNumberOfHearts() {
     }
 
     public EntitySkeleton getEntity() {
+        this.entity = new EntitySkeleton(this.world);
+        this.entity.setHeldItem(EnumHand.MAIN_HAND, new ItemStack(Items.BOW));
         return this.entity;
     }
 
@@ -50,4 +50,6 @@ public int getInterfaceOffsetX() {
     public int getInterfaceOffsetY() {
         return this.interfaceOffsetY;
     }
+
+    public int getSimulationTickCost() { return 80; }
 }
diff --git a/src/main/java/xt9/deepmoblearning/common/mobs/SpiderMeta.java b/src/main/java/xt9/deepmoblearning/common/mobs/SpiderMeta.java
@@ -20,8 +20,6 @@ public class SpiderMeta extends MobMetaData {
 
     public SpiderMeta() {
         super();
-        this.entity = new EntitySpider(this.world);
-        this.caveSpiderEntity = new EntityCaveSpider(this.world);
     }
 
     public String getMobName() {
@@ -37,10 +35,12 @@ public int getNumberOfHearts() {
     }
 
     public EntitySpider getEntity() {
+        this.entity = new EntitySpider(this.world);
         return this.entity;
     }
 
     public EntitySpider getExtraEntity() {
+        this.caveSpiderEntity = new EntityCaveSpider(this.world);
         return this.caveSpiderEntity;
     }
 
@@ -63,4 +63,6 @@ public int getExtraInterfaceOffsetX() {
     public int getExtraInterfaceOffsetY() {
         return this.caveSpiderOffsetY;
     }
+
+    public int getSimulationTickCost() { return 80; }
 }
diff --git a/src/main/java/xt9/deepmoblearning/common/mobs/WitchMeta.java b/src/main/java/xt9/deepmoblearning/common/mobs/WitchMeta.java
@@ -19,8 +19,6 @@ public class WitchMeta extends MobMetaData {
 
     public WitchMeta() {
         super();
-        this.entity = new EntityWitch(this.world);
-        this.entity.setHeldItem(EnumHand.MAIN_HAND, new ItemStack(Items.POTIONITEM));
     }
 
     public String getMobName() {
@@ -36,6 +34,8 @@ public int getNumberOfHearts() {
     }
 
     public EntityWitch getEntity() {
+        this.entity = new EntityWitch(this.world);
+        this.entity.setHeldItem(EnumHand.MAIN_HAND, new ItemStack(Items.POTIONITEM));
         return this.entity;
     }
 
@@ -50,4 +50,6 @@ public int getInterfaceOffsetX() {
     public int getInterfaceOffsetY() {
         return this.interfaceOffsetY;
     }
+
+    public int getSimulationTickCost() { return 128; }
 }
diff --git a/src/main/java/xt9/deepmoblearning/common/mobs/WitherMeta.java b/src/main/java/xt9/deepmoblearning/common/mobs/WitherMeta.java
@@ -16,7 +16,6 @@ public class WitherMeta extends MobMetaData {
 
     public WitherMeta() {
         super();
-        this.entity = new EntityWither(this.world);
     }
 
     public String getMobName() {
@@ -32,6 +31,7 @@ public int getNumberOfHearts() {
     }
 
     public EntityWither getEntity() {
+        this.entity = new EntityWither(this.world);
         return this.entity;
     }
 
@@ -46,4 +46,6 @@ public int getInterfaceOffsetX() {
     public int getInterfaceOffsetY() {
         return this.interfaceOffsetY;
     }
+
+    public int getSimulationTickCost() { return 2048; }
 }
diff --git a/src/main/java/xt9/deepmoblearning/common/mobs/WitherSkeletonMeta.java b/src/main/java/xt9/deepmoblearning/common/mobs/WitherSkeletonMeta.java
@@ -19,8 +19,6 @@ public class WitherSkeletonMeta extends MobMetaData {
 
     public WitherSkeletonMeta() {
         super();
-        this.entity = new EntityWitherSkeleton(this.world);
-        this.entity.setHeldItem(EnumHand.MAIN_HAND, new ItemStack(Items.STONE_SWORD));
     }
 
     public String getMobName() {
@@ -36,6 +34,8 @@ public int getNumberOfHearts() {
     }
 
     public EntityWitherSkeleton getEntity() {
+        this.entity = new EntityWitherSkeleton(this.world);
+        this.entity.setHeldItem(EnumHand.MAIN_HAND, new ItemStack(Items.STONE_SWORD));
         return this.entity;
     }
 
@@ -50,4 +50,6 @@ public int getInterfaceOffsetX() {
     public int getInterfaceOffsetY() {
         return this.interfaceOffsetY;
     }
+
+    public int getSimulationTickCost() { return 750; }
 }