Skip to content

Commit 8cd0864

Browse files
committed
0.10
- Buffed the pristine spider matter (spider eyes) - Added creative item for data model leveling - The deep learner now only opens while not holding shift or ctrl (to avoid screwing up sneaking/block placing scenarios) - Bumped the max input rf/t for the Simulation chamber to 25k rf/t - Bumped the internal rf buffer of the Simulation chamber to 2 million - Slightly changed the Polymer clay recipe
1 parent 7de5a7b commit 8cd0864

17 files changed

Lines changed: 121 additions & 44 deletions

File tree

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ apply plugin: 'net.minecraftforge.gradle.forge'
1212

1313
def mcVersion = "1.12.2"
1414
def modMajor = "0"
15-
def modMinor = "9"
15+
def modMinor = "10"
16+
1617

1718
version = "${mcVersion}-${modMajor}.${modMinor}"
1819
group = "xt9.deepmoblearning" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
@@ -87,7 +88,6 @@ processResources {
8788
sourceSets {
8889
main {
8990
java {
90-
exclude '**/DevSpawn.java'
9191
exclude '**/DevTooltip.java'
9292
}
9393
}

changelog.md

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
11
# 1.12.2
2-
## 0.9
3-
First beta version.
2+
3+
4+
### 0.10
5+
- Buffed the pristine spider matter (spider eyes)
6+
- Added creative item for data model leveling
7+
- The deep learner now only opens while not holding shift or ctrl
8+
(to avoid screwing up sneaking/block placing scenarios)
9+
- Bumped the max input rf/t for the Simulation chamber to 25k rf/t
10+
- Bumped the internal rf buffer of the Simulation chamber to 2 million
11+
- Slightly changed the Polymer clay recipe
12+
13+
### 0.9.0
14+
- Added the remaining textures needed
15+
- Mob chips now have different rf/t simulation costs in the simulation chamber
16+
- Added charred redstone/plates to avoid mod recipe collisions
17+
- Added more transmution recipes
18+
- Data model leveling tweaked to be easier

src/main/java/xt9/deepmoblearning/client/gui/SimulationChamberGui.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import net.minecraft.client.gui.inventory.GuiContainer;
77
import net.minecraft.client.renderer.GlStateManager;
88
import net.minecraft.entity.player.InventoryPlayer;
9-
import net.minecraft.item.Item;
109
import net.minecraft.item.ItemStack;
1110
import net.minecraft.util.ResourceLocation;
1211
import net.minecraft.world.World;

src/main/java/xt9/deepmoblearning/common/Registry.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ public class Registry {
1717
public static BlockSimulationChamber blockSimulationChamber;
1818

1919
public static NonNullList<ItemBase> items = NonNullList.create();
20+
public static Item simulationChamber;
2021
public static ItemPolymerClay polymerClay;
2122
public static ItemCharredRedstone charredRedstone;
2223
public static ItemCharredPlate charredPlate;
2324
public static ItemLivingMatter livingMatter;
2425
public static ItemPristineMatter pristineMatter;
2526
public static ItemDeepLearner deepLearner;
2627
public static ItemMobChip mobChip;
27-
public static Item simulationChamber;
28+
public static ItemCreativeModelLearner cml;
2829

2930
public static void registerBlocks(IForgeRegistry registry) {
3031
blockSimulationChamber = new BlockSimulationChamber();
@@ -55,6 +56,8 @@ public static void registerItems(IForgeRegistry registry) {
5556
items.add(livingMatter);
5657
pristineMatter = new ItemPristineMatter();
5758
items.add(pristineMatter);
59+
cml = new ItemCreativeModelLearner();
60+
items.add(cml);
5861

5962
for (Item item : items) {
6063
registry.register(item);

src/main/java/xt9/deepmoblearning/common/blocks/ItemBlockBase.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import net.minecraft.item.ItemBlock;
55
import net.minecraft.item.ItemStack;
66
import xt9.deepmoblearning.DeepMobLearning;
7-
import xt9.deepmoblearning.common.items.ItemBase;
87

98
/**
109
* Created by xt9 on 2017-06-15.

src/main/java/xt9/deepmoblearning/common/events/DevSpawn.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/main/java/xt9/deepmoblearning/common/events/DevTooltip.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import net.minecraft.client.resources.I18n;
44
import net.minecraft.item.ItemStack;
5-
import net.minecraft.launchwrapper.Launch;
65
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
76
import net.minecraftforge.fml.common.Mod;
87
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;

src/main/java/xt9/deepmoblearning/common/events/EntityDeathHandler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import net.minecraft.item.ItemStack;
55
import net.minecraft.util.NonNullList;
66
import net.minecraftforge.event.entity.living.LivingDeathEvent;
7-
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
87
import net.minecraftforge.fml.common.Mod;
98
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
109
import xt9.deepmoblearning.common.items.ItemDeepLearner;
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
package xt9.deepmoblearning.common.items;
2+
3+
import net.minecraft.client.resources.I18n;
4+
import net.minecraft.client.util.ITooltipFlag;
5+
import net.minecraft.entity.player.EntityPlayer;
6+
import net.minecraft.entity.player.InventoryPlayer;
7+
import net.minecraft.inventory.EntityEquipmentSlot;
8+
import net.minecraft.item.ItemStack;
9+
import net.minecraft.nbt.NBTTagCompound;
10+
import net.minecraft.nbt.NBTTagList;
11+
import net.minecraft.util.ActionResult;
12+
import net.minecraft.util.EnumActionResult;
13+
import net.minecraft.util.EnumHand;
14+
import net.minecraft.util.NonNullList;
15+
import net.minecraft.util.text.TextComponentString;
16+
import net.minecraft.world.World;
17+
import net.minecraftforge.common.util.Constants;
18+
import xt9.deepmoblearning.DeepConstants;
19+
import xt9.deepmoblearning.common.CommonProxy;
20+
import xt9.deepmoblearning.common.util.KeyboardHelper;
21+
22+
import javax.annotation.Nullable;
23+
import java.util.List;
24+
25+
public class ItemCreativeModelLearner extends ItemBase {
26+
public ItemCreativeModelLearner() {
27+
super("creative_model_learner", 1);
28+
}
29+
30+
@Override
31+
public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer player, @Nullable EnumHand hand) {
32+
NonNullList<ItemStack> inv1 = player.inventory.mainInventory;
33+
NonNullList<ItemStack> inv2 = player.inventory.offHandInventory;
34+
35+
if(!player.world.isRemote) {
36+
if(KeyboardHelper.isHoldingShift()) {
37+
findAndLevelUpModels(inv1, player, true);
38+
findAndLevelUpModels(inv2, player, true);
39+
} else if(KeyboardHelper.isHoldingCTRL()) {
40+
findAndLevelUpModels(inv1, player, false);
41+
findAndLevelUpModels(inv2, player, false);
42+
}
43+
}
44+
45+
46+
return new ActionResult(EnumActionResult.PASS, player.getHeldItem(hand));
47+
}
48+
49+
public void findAndLevelUpModels(NonNullList<ItemStack> inventory, EntityPlayer player, boolean increaseWholeTier) {
50+
for(ItemStack inventoryStack : inventory) {
51+
if (inventoryStack.getItem() instanceof ItemDeepLearner) {
52+
NonNullList<ItemStack> deepLearnerInternalInv = ItemDeepLearner.getContainedItems(inventoryStack);
53+
for (ItemStack stack : deepLearnerInternalInv) {
54+
if (stack.getItem() instanceof ItemMobChip) {
55+
int tier = ItemMobChip.getTier(stack);
56+
if(tier != DeepConstants.MOB_CHIP_MAXIMUM_TIER) {
57+
if(increaseWholeTier) {
58+
ItemMobChip.setTier(stack, (tier + 1));
59+
} else {
60+
ItemMobChip.increaseMobKillCount(stack, player);
61+
}
62+
}
63+
64+
}
65+
ItemDeepLearner.setContainedItems(inventoryStack, deepLearnerInternalInv);
66+
}
67+
}
68+
}
69+
}
70+
71+
@Override
72+
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> list, ITooltipFlag flagIn) {
73+
if(!KeyboardHelper.isHoldingShift()) {
74+
list.add(I18n.format("deepmoblearning.holdshift"));
75+
} else {
76+
list.add("A creative item that levels up data models inside the Deep Learner." );
77+
list.add("§r§oSHIFT§r§7 + §r§oRIGHT§r§7 click to increase tier.§r" );
78+
list.add("§r§oCTRL§r§7 + §r§oRIGHT§r§7 click to simulate kills.§r" );
79+
}
80+
81+
}
82+
}

src/main/java/xt9/deepmoblearning/common/items/ItemDeepLearner.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ public ItemDeepLearner() {
2828
@Override
2929
public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer player, @Nullable EnumHand hand)
3030
{
31-
CommonProxy.openItemGui(player, hand == EnumHand.MAIN_HAND ? EntityEquipmentSlot.MAINHAND : EntityEquipmentSlot.OFFHAND);
31+
if(!KeyboardHelper.isHoldingShift() && !KeyboardHelper.isHoldingCTRL()) {
32+
CommonProxy.openItemGui(player, hand == EnumHand.MAIN_HAND ? EntityEquipmentSlot.MAINHAND : EntityEquipmentSlot.OFFHAND);
33+
}
3234
return new ActionResult(EnumActionResult.PASS, player.getHeldItem(hand));
3335
}
3436

0 commit comments

Comments
 (0)