diff --git a/README.md b/README.md index 57f29db..be47190 100644 --- a/README.md +++ b/README.md @@ -2,26 +2,18 @@ This is the unfinished port of the WebDisplays mod for Minecraft 1.12.2. The text below is my "TODO" list. ### Missing features -* ~~Peripheral: ComputerCraft interface~~ (CC not up to date) * Peripheral: OpenComputers interface * Server blocks (to store some of the player's web pages) * Read config (see "Config elements" below) ### TODO * Center camera to screen when using keyboard -* Achievements (minePad 2 and all that stuff) * Top/bottom screen orientation * GuiSetURL2 missing buttons -* Plugin API * Automatically add protocol to URLs * Using the remote control tool too far away (with a chunk loader ofc) may trigger distance guard in SMessageScreenCtrl -* Recipes: why do I need to craft first to have them in my crafting book? * French translations -* Embedded videos sound/distance * minePad management: check GuiContainer.draggedStack for minePad -* Enhance crafts -* Enhance models -* minePad item texture seems to be transparent in some corners... * Change mod name to WD2 * Put a limit on screen resolution @@ -33,3 +25,8 @@ This is the unfinished port of the WebDisplays mod for Minecraft 1.12.2. The tex * Browser language * Screen load/unload distance (max distance = 60.0) * Disable ownership thief item + +### Delayed things +* Plugin API +* The Shop +* CC Interface, if CC gets updated... diff --git a/src/main/java/net/montoyo/wd/client/ClientProxy.java b/src/main/java/net/montoyo/wd/client/ClientProxy.java index 7bf853a..19e3d61 100644 --- a/src/main/java/net/montoyo/wd/client/ClientProxy.java +++ b/src/main/java/net/montoyo/wd/client/ClientProxy.java @@ -328,6 +328,7 @@ public class ClientProxy extends SharedProxy implements IResourceManagerReloadLi public void onRegisterModels(ModelRegistryEvent ev) { final WebDisplays wd = WebDisplays.INSTANCE; + //I hope I'm doing this right because it doesn't seem like it... registerItemModel(wd.blockScreen.getItem(), 0, "inventory"); ModelLoader.setCustomModelResourceLocation(wd.blockPeripheral.getItem(), 0, new ModelResourceLocation("webdisplays:kb_inv", "normal")); registerItemModel(wd.blockPeripheral.getItem(), 1, "facing=2,type=ccinterface"); @@ -338,6 +339,7 @@ public class ClientProxy extends SharedProxy implements IResourceManagerReloadLi registerItemModel(wd.itemOwnerThief, 0, "normal"); registerItemModel(wd.itemLinker, 0, "normal"); registerItemModel(wd.itemMinePad, 0, "normal"); + registerItemModel(wd.itemMinePad, 1, "normal"); registerItemModel(wd.itemLaserPointer, 0, "normal"); DefaultUpgrade[] upgrades = DefaultUpgrade.values(); diff --git a/src/main/java/net/montoyo/wd/item/ItemMinePad2.java b/src/main/java/net/montoyo/wd/item/ItemMinePad2.java index d05205b..d80c109 100644 --- a/src/main/java/net/montoyo/wd/item/ItemMinePad2.java +++ b/src/main/java/net/montoyo/wd/item/ItemMinePad2.java @@ -33,6 +33,7 @@ public class ItemMinePad2 extends Item { setRegistryName("minepad"); setMaxStackSize(1); setFull3D(); + setMaxDamage(0); setCreativeTab(WebDisplays.CREATIVE_TAB); } @@ -99,4 +100,13 @@ public class ItemMinePad2 extends Item { return false; } + @Override + public String getUnlocalizedName(ItemStack stack) { + String ret = getUnlocalizedName(); + if(stack.getMetadata() > 0) + ret += "2"; + + return ret; + } + } diff --git a/src/main/resources/assets/webdisplays/lang/en_us.lang b/src/main/resources/assets/webdisplays/lang/en_us.lang index f672685..edb9c12 100644 --- a/src/main/resources/assets/webdisplays/lang/en_us.lang +++ b/src/main/resources/assets/webdisplays/lang/en_us.lang @@ -18,6 +18,7 @@ item.webdisplays.craftcomp.batpack.name=Battery Pack item.webdisplays.craftcomp.laserdiode.name=650nm Laser Diode item.webdisplays.craftcomp.backlight.name=Backlight item.webdisplays.minepad.name=minePad +item.webdisplays.minepad2.name=minePad 2 item.webdisplays.upgrade.name=Screen Upgrade item.webdisplays.upgrade.lasermouse.name=Laser Sensor item.webdisplays.upgrade.redinput.name=Redstone Input Port @@ -76,3 +77,5 @@ advancements.webdisplays.minepad.title=This is a revolution advancements.webdisplays.minepad.description=Get your hands on the newest technology: the minePad advancements.webdisplays.padbreak.title=Reverse Engineering advancements.webdisplays.padbreak.description=These things are fragile! Don't drop a minePad from high place to unlock the upgrade recipes +advancements.webdisplays.minepad2.title=Pigeon +advancements.webdisplays.minepad2.description=Craft a minePad 2. Look, I know it's expensive, but that means it's better than anything else, right? ...right? diff --git a/src/main/resources/assets/webdisplays/recipes/minepad.json b/src/main/resources/assets/webdisplays/recipes/minepad.json index f86caf4..7842490 100644 --- a/src/main/resources/assets/webdisplays/recipes/minepad.json +++ b/src/main/resources/assets/webdisplays/recipes/minepad.json @@ -30,6 +30,7 @@ } }, "result": { - "item": "webdisplays:minepad" + "item": "webdisplays:minepad", + "data": 0 } } diff --git a/src/main/resources/assets/webdisplays/recipes/minepad2.json b/src/main/resources/assets/webdisplays/recipes/minepad2.json new file mode 100644 index 0000000..af5ac84 --- /dev/null +++ b/src/main/resources/assets/webdisplays/recipes/minepad2.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "DDD", + "DMD", + "DDD" + ], + "key": { + "D": { + "item": "minecraft:diamond_block" + }, + "M": { + "item": "webdisplays:minepad", + "data": 0 + } + }, + "result": { + "item": "webdisplays:minepad", + "data": 1 + } +}