-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- 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
- Loading branch information
Showing
17 changed files
with
121 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,18 @@ | ||
# 1.12.2 | ||
## 0.9 | ||
First beta version. | ||
|
||
|
||
### 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 | ||
|
||
### 0.9.0 | ||
- Added the remaining textures needed | ||
- Mob chips now have different rf/t simulation costs in the simulation chamber | ||
- Added charred redstone/plates to avoid mod recipe collisions | ||
- Added more transmution recipes | ||
- Data model leveling tweaked to be easier |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 0 additions & 28 deletions
28
src/main/java/xt9/deepmoblearning/common/events/DevSpawn.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
src/main/java/xt9/deepmoblearning/common/items/ItemCreativeModelLearner.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
package xt9.deepmoblearning.common.items; | ||
|
||
import net.minecraft.client.resources.I18n; | ||
import net.minecraft.client.util.ITooltipFlag; | ||
import net.minecraft.entity.player.EntityPlayer; | ||
import net.minecraft.entity.player.InventoryPlayer; | ||
import net.minecraft.inventory.EntityEquipmentSlot; | ||
import net.minecraft.item.ItemStack; | ||
import net.minecraft.nbt.NBTTagCompound; | ||
import net.minecraft.nbt.NBTTagList; | ||
import net.minecraft.util.ActionResult; | ||
import net.minecraft.util.EnumActionResult; | ||
import net.minecraft.util.EnumHand; | ||
import net.minecraft.util.NonNullList; | ||
import net.minecraft.util.text.TextComponentString; | ||
import net.minecraft.world.World; | ||
import net.minecraftforge.common.util.Constants; | ||
import xt9.deepmoblearning.DeepConstants; | ||
import xt9.deepmoblearning.common.CommonProxy; | ||
import xt9.deepmoblearning.common.util.KeyboardHelper; | ||
|
||
import javax.annotation.Nullable; | ||
import java.util.List; | ||
|
||
public class ItemCreativeModelLearner extends ItemBase { | ||
public ItemCreativeModelLearner() { | ||
super("creative_model_learner", 1); | ||
} | ||
|
||
@Override | ||
public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer player, @Nullable EnumHand hand) { | ||
NonNullList<ItemStack> inv1 = player.inventory.mainInventory; | ||
NonNullList<ItemStack> inv2 = player.inventory.offHandInventory; | ||
|
||
if(!player.world.isRemote) { | ||
if(KeyboardHelper.isHoldingShift()) { | ||
findAndLevelUpModels(inv1, player, true); | ||
findAndLevelUpModels(inv2, player, true); | ||
} else if(KeyboardHelper.isHoldingCTRL()) { | ||
findAndLevelUpModels(inv1, player, false); | ||
findAndLevelUpModels(inv2, player, false); | ||
} | ||
} | ||
|
||
|
||
return new ActionResult(EnumActionResult.PASS, player.getHeldItem(hand)); | ||
} | ||
|
||
public void findAndLevelUpModels(NonNullList<ItemStack> inventory, EntityPlayer player, boolean increaseWholeTier) { | ||
for(ItemStack inventoryStack : inventory) { | ||
if (inventoryStack.getItem() instanceof ItemDeepLearner) { | ||
NonNullList<ItemStack> deepLearnerInternalInv = ItemDeepLearner.getContainedItems(inventoryStack); | ||
for (ItemStack stack : deepLearnerInternalInv) { | ||
if (stack.getItem() instanceof ItemMobChip) { | ||
int tier = ItemMobChip.getTier(stack); | ||
if(tier != DeepConstants.MOB_CHIP_MAXIMUM_TIER) { | ||
if(increaseWholeTier) { | ||
ItemMobChip.setTier(stack, (tier + 1)); | ||
} else { | ||
ItemMobChip.increaseMobKillCount(stack, player); | ||
} | ||
} | ||
|
||
} | ||
ItemDeepLearner.setContainedItems(inventoryStack, deepLearnerInternalInv); | ||
} | ||
} | ||
} | ||
} | ||
|
||
@Override | ||
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> list, ITooltipFlag flagIn) { | ||
if(!KeyboardHelper.isHoldingShift()) { | ||
list.add(I18n.format("deepmoblearning.holdshift")); | ||
} else { | ||
list.add("A creative item that levels up data models inside the Deep Learner." ); | ||
list.add("§r§oSHIFT§r§7 + §r§oRIGHT§r§7 click to increase tier.§r" ); | ||
list.add("§r§oCTRL§r§7 + §r§oRIGHT§r§7 click to simulate kills.§r" ); | ||
} | ||
|
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
src/main/resources/assets/deepmoblearning/models/item/creative_model_learner.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"parent": "item/generated", | ||
"textures": { | ||
"layer0": "deepmoblearning:items/creative_model_learner" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,6 @@ | |
], | ||
"result": { | ||
"item": "minecraft:spider_eye", | ||
"count": 8 | ||
"count": 16 | ||
} | ||
} |
6 changes: 3 additions & 3 deletions
6
...ources/assets/deepmoblearning/recipes/simulation_chamber/inputs/recipe1_polymer_clay.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+518 Bytes
...main/resources/assets/deepmoblearning/textures/items/creative_model_learner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.