Skip to content

Commit 90128cc

Browse files
DarkBumusDarkBumus
committed
Release 2.0.3
- Fixed another implementation bug, this time for Wild Beetroot - Cleaned up the External Value Registry - Changed the functionality of the tooltip adder
1 parent e620402 commit 90128cc

File tree

9 files changed

+51
-28
lines changed

9 files changed

+51
-28
lines changed

‎src/main/java/darkbum/saltymod/block/BlockSaltFlowerSand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,10 @@ public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int meta,
199199

200200
switch (meta) {
201201
case 0:
202-
drop.add(new ItemStack(this, 1, 5));
202+
drop.add(new ItemStack(this, 1, 0));
203203
break;
204204
case 1:
205-
drop.add(new ItemStack(this, 1, 5));
205+
drop.add(new ItemStack(this, 1, 0));
206206
if (Loader.isModLoaded("etfuturum")
207207
&& ganymedes01.etfuturum.configuration.configs.ConfigBlocksItems.enableBeetroot) {
208208
Item beetroot = GameRegistry.findItem("etfuturum", "beetroot");

‎src/main/java/darkbum/saltymod/common/proxy/CommonProxy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import darkbum.saltymod.common.config.ModConfigurationBlocks;
2626
import darkbum.saltymod.common.config.ModConfigurationWorldGeneration;
2727
import darkbum.saltymod.init.ModItems;
28-
import darkbum.saltymod.inventory.gui.GuiHandler;
28+
import darkbum.saltymod.util.GuiHandler;
2929
import darkbum.saltymod.network.EvaporatorButtonMessage;
3030
import darkbum.saltymod.network.SaltwortMessage;
3131
import darkbum.saltymod.world.generator.*;

‎src/main/java/darkbum/saltymod/init/ModExternalValueRegistry.java‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
import net.minecraft.item.ItemFood;
77
import net.minecraft.item.ItemSoup;
88

9-
import static cpw.mods.fml.common.Loader.isModLoaded;
10-
import static cpw.mods.fml.common.registry.GameRegistry.findItem;
9+
import static darkbum.saltymod.common.config.ModConfigurationBlocks.*;
1110
import static darkbum.saltymod.common.config.ModConfigurationModCompatibility.*;
1211
import static darkbum.saltymod.common.config.ModConfigurationVanillaChanges.*;
12+
import static darkbum.saltymod.init.ModExternalLoader.*;
1313
import static darkbum.saltymod.init.ModItems.*;
14+
import static net.minecraft.init.Items.*;
1415

1516
/**
1617
* External Value Registry class.
@@ -142,67 +143,67 @@ public static void init() {
142143
pumpkin_pie.setPotionEffect(resistance, 90, 1, two_thirds);
143144
}
144145

145-
if (isModLoaded("etfuturum") && enableEFRFoodValueChanges) {
146-
Item raw_mutton = findItem("etfuturum", "raw_mutton");
146+
if (efr && enableEFRFoodValueChanges) {
147+
Item raw_mutton = etFuturumItems.get("mutton_raw");
147148
if (raw_mutton instanceof ItemFood ItemMuttonRaw) {
148149
ItemMuttonRaw.healAmount = 2;
149150
ItemMuttonRaw.saturationModifier = 0.6f;
150151
}
151152

152-
Item mutton_cooked = findItem("etfuturum", "mutton_cooked");
153+
Item mutton_cooked = etFuturumItems.get("mutton_cooked");
153154
if (mutton_cooked instanceof ItemFood ItemMuttonCooked) {
154155
ItemMuttonCooked.healAmount = 4;
155156
ItemMuttonCooked.saturationModifier = 0.6f;
156157
ItemMuttonCooked.setPotionEffect(health_boost, 5, 0, one_third);
157158
}
158159

159-
Item rabbit_raw = findItem("etfuturum", "rabbit_raw");
160+
Item rabbit_raw = etFuturumItems.get("rabbit_raw");
160161
if (rabbit_raw instanceof ItemFood ItemRabbitRaw) {
161162
ItemRabbitRaw.healAmount = 1;
162163
ItemRabbitRaw.saturationModifier = 0.6f;
163164
}
164165

165-
Item rabbit_cooked = findItem("etfuturum", "rabbit_cooked");
166+
Item rabbit_cooked = etFuturumItems.get("rabbit_cooked");
166167
if (rabbit_cooked instanceof ItemFood ItemRabbitCooked) {
167168
ItemRabbitCooked.healAmount = 3;
168169
ItemRabbitCooked.saturationModifier = 0.6f;
169170
ItemRabbitCooked.setPotionEffect(health_boost, 5, 0, one_third);
170171
}
171172

172-
Item rabbit_stew = findItem("etfuturum", "rabbit_stew");
173+
Item rabbit_stew = etFuturumItems.get("rabbit_stew");
173174
if (rabbit_stew instanceof ItemFood ItemRabbitStew) {
174175
ItemRabbitStew.healAmount = 7;
175176
ItemRabbitStew.saturationModifier = 0.7f;
176177
ItemRabbitStew.setPotionEffect(health_boost, 30, 0, one_third);
177178
}
178179

179-
Item beetroot = findItem("etfuturum", "beetroot");
180+
Item beetroot = etFuturumItems.get("beetroot");
180181
if (beetroot instanceof ItemFood ItemBeetroot) {
181182
ItemBeetroot.healAmount = 1;
182183
ItemBeetroot.saturationModifier = 0.3f;
183184
ItemBeetroot.setPotionEffect(jump_boost, 5, 0, one_third);
184185
}
185186

186-
Item beetroot_soup = findItem("etfuturum", "beetroot_soup");
187+
Item beetroot_soup = etFuturumItems.get("beetroot_soup");
187188
if (beetroot_soup instanceof ItemFood ItemBeetrootSoup) {
188189
ItemBeetrootSoup.healAmount = 5;
189190
ItemBeetrootSoup.saturationModifier = 0.7f;
190191
ItemBeetrootSoup.setPotionEffect(jump_boost, 60, 1, one_third);
191192
}
192193

193-
Item chorus_fruit = findItem("etfuturum", "chorus_fruit");
194+
Item chorus_fruit = etFuturumItems.get("chorus_fruit");
194195
if (chorus_fruit instanceof ItemFood ItemChorusFruit) {
195196
ItemChorusFruit.healAmount = 1;
196197
ItemChorusFruit.saturationModifier = 0.3f;
197198
}
198199

199-
Item suspicious_stew = findItem("etfuturum", "suspicious_stew");
200+
Item suspicious_stew = etFuturumItems.get("suspicious_stew");
200201
if (suspicious_stew instanceof ItemFood ItemSuspiciousStew) {
201202
ItemSuspiciousStew.healAmount = 5;
202203
ItemSuspiciousStew.saturationModifier = 0.7f;
203204
}
204205

205-
Item sweet_berries = findItem("etfuturum", "sweet_berries");
206+
Item sweet_berries = etFuturumItems.get("sweet_berries");
206207
if (sweet_berries instanceof ItemFood ItemSweetBerries) {
207208
ItemSweetBerries.healAmount = 1;
208209
ItemSweetBerries.saturationModifier = 0.3f;
@@ -211,27 +212,32 @@ public static void init() {
211212
}
212213

213214
if (enableMushroomStewStacksize16) {
214-
Item mushroom_stew = findItem("minecraft", "mushroom_stew");
215+
ItemFood mushroom_stew = (ItemFood) Items.mushroom_stew;
215216
mushroom_stew.setMaxStackSize(16);
216217
}
217218

218-
if (isModLoaded("etfuturum") && enableEFRStewsStacksize16) {
219-
Item rabbit_stew = findItem("etfuturum", "rabbit_stew");
219+
if (efr && enableEFRStewsStacksize16) {
220+
Item rabbit_stew = etFuturumItems.get("rabbit_stew");
220221
if (rabbit_stew instanceof ItemSoup ItemRabbitStew) {
221222
ItemRabbitStew.setMaxStackSize(16);
222223
}
223224

224-
Item beetroot_soup = findItem("etfuturum", "beetroot_soup");
225+
Item beetroot_soup = etFuturumItems.get("beetroot_soup");
225226
if (beetroot_soup instanceof ItemSoup ItemBeetrootSoup) {
226227
ItemBeetrootSoup.setMaxStackSize(16);
227228
}
228229

229-
Item suspicious_stew = findItem("etfuturum", "suspicious_stew");
230+
Item suspicious_stew = etFuturumItems.get("suspicious_stew");
230231
if (suspicious_stew instanceof ItemSoup ItemSuspiciousStew) {
231232
ItemSuspiciousStew.setMaxStackSize(16);
232233
}
233234
}
234-
Item woodenShovel = findItem("minecraft", "wooden_shovel");
235-
woodenShovel.setMaxDamage(64);
235+
if (enableMachines) {
236+
wooden_shovel.setMaxDamage(64);
237+
wooden_pickaxe.setMaxDamage(64);
238+
wooden_axe.setMaxDamage(64);
239+
wooden_hoe.setMaxDamage(64);
240+
wooden_sword.setMaxDamage(64);
241+
}
236242
}
237243
}

‎src/main/java/darkbum/saltymod/init/ModOreDictionary.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import static net.minecraft.init.Items.cake;
1919

2020
/**
21-
* Recipe class for {@link TileEntityEvaporator}
21+
* OreDictionary class.
2222
*
2323
* @author DarkBum
2424
* @since 1.9.f

src/main/java/darkbum/saltymod/inventory/gui/GuiHandler.java renamed to src/main/java/darkbum/saltymod/util/GuiHandler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package darkbum.saltymod.inventory.gui;
1+
package darkbum.saltymod.util;
22

33
import darkbum.saltymod.inventory.container.*;
4+
import darkbum.saltymod.inventory.gui.*;
45
import darkbum.saltymod.tileentity.*;
56
import net.minecraft.entity.player.EntityPlayer;
67
import net.minecraft.tileentity.TileEntity;

‎src/main/java/darkbum/saltymod/util/ItemUtils.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,25 @@ public static void addItemTooltip(ItemStack stack, List<String> list) {
3232
String baseKey = stack.getUnlocalizedName();
3333
String tooltipKey = baseKey + ".tooltip";
3434

35-
String tooltip = I18n.format(tooltipKey);
36-
if (!tooltip.equals(tooltipKey)) {
37-
list.add(tooltip);
35+
boolean foundAny = false;
36+
for (int i = 0; i < 10; i++) {
37+
String lineKey = tooltipKey + "." + i;
38+
String line = I18n.format(lineKey);
39+
if (!line.equals(lineKey)) {
40+
list.add(line);
41+
foundAny = true;
42+
} else if (i == 0) {
43+
break;
44+
} else {
45+
break;
46+
}
47+
}
48+
49+
if (!foundAny) {
50+
String singleTooltip = I18n.format(tooltipKey);
51+
if (!singleTooltip.equals(tooltipKey)) {
52+
list.add(singleTooltip);
53+
}
3854
}
3955
}
4056

‎src/main/resources/assets/saltymod/textures/items/dev/cooked_duck.png‎

513 Bytes
Loading

‎src/main/resources/assets/saltymod/textures/items/dev/duck.png‎

1.02 KB
Loading

‎src/main/resources/assets/saltymod/textures/items/dev/frying_pan.png‎

510 Bytes
Loading

0 commit comments

Comments
 (0)