Skip to content

Commit ab3b07c

Browse files
KingLemmingKingLemming
committed
Bump to 2.3.7.
Finalize Tome of Knowledge (for now) Signed-off-by: King Lemming <kinglemming@gmail.com>
1 parent 97e58eb commit ab3b07c

27 files changed

+1068
-616
lines changed

‎build.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Minecraft Version
2-
mc_version=1.12
3-
forge_version=14.21.1.2443
2+
mc_version=1.12.2
3+
forge_version=14.23.1.2555
44
mappings=snapshot_20171003
55

66
# Mod Version
7-
mod_version=2.3.6
7+
mod_version=2.3.7
88

99
# Dependencies
1010
rf_version=2.0.1.+
11-
cofh_core_version=4.3.6.+
11+
cofh_core_version=4.3.7.+
1212
cofh_world_version=1.0.1.+

‎src/main/java/cofh/thermalfoundation/ThermalFoundation.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import cofh.thermalfoundation.init.*;
99
import cofh.thermalfoundation.network.PacketTFBase;
1010
import cofh.thermalfoundation.proxy.Proxy;
11-
import cofh.thermalfoundation.util.EventHandlerLexicon;
1211
import cofh.thermalfoundation.util.IMCHandler;
1312
import cofh.thermalfoundation.util.LexiconManager;
1413
import net.minecraft.creativetab.CreativeTabs;
@@ -32,7 +31,7 @@ public class ThermalFoundation {
3231
public static final String MOD_ID = "thermalfoundation";
3332
public static final String MOD_NAME = "Thermal Foundation";
3433

35-
public static final String VERSION = "2.3.6";
34+
public static final String VERSION = "2.3.7";
3635
public static final String VERSION_MAX = "2.4.0";
3736
public static final String VERSION_GROUP = "required-after:" + MOD_ID + "@[" + VERSION + "," + VERSION_MAX + ");";
3837
public static final String UPDATE_URL = "https://raw.github.com/cofh/version/master/" + MOD_ID + "_update.json";
@@ -132,7 +131,6 @@ private void registerHandlers() {
132131
NetworkRegistry.INSTANCE.registerGuiHandler(instance, GUI_HANDLER);
133132

134133
LexiconManager.initialize();
135-
EventHandlerLexicon.initialize();
136134
PacketTFBase.initialize();
137135
}
138136

‎src/main/java/cofh/thermalfoundation/block/BlockOre.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,17 +145,12 @@ public boolean register() {
145145
addSmelting(oreTin, ItemMaterial.ingotTin, 0.7F);
146146
addSmelting(oreSilver, ItemMaterial.ingotSilver, 0.9F);
147147
addSmelting(oreLead, ItemMaterial.ingotLead, 0.8F);
148-
// addSmelting(oreAluminum, ItemMaterial.ingotAluminum, 0.6F);
148+
addSmelting(oreAluminum, ItemMaterial.ingotAluminum, 0.6F);
149149
addSmelting(oreNickel, ItemMaterial.ingotNickel, 1.0F);
150150
addSmelting(orePlatinum, ItemMaterial.ingotPlatinum, 1.0F);
151-
// addSmelting(oreIridium, ItemMaterial.ingotIridium, 1.2F);
152-
// addSmelting(oreMithril, ItemMaterial.ingotMithril, 1.5F);
151+
addSmelting(oreIridium, ItemMaterial.ingotIridium, 1.2F);
152+
addSmelting(oreMithril, ItemMaterial.ingotMithril, 1.5F);
153153

154-
if (!Loader.isModLoaded("thermalexpansion")) {
155-
addSmelting(oreAluminum, ItemMaterial.ingotAluminum, 0.6F);
156-
addSmelting(oreIridium, ItemMaterial.ingotIridium, 1.2F);
157-
addSmelting(oreMithril, ItemMaterial.ingotMithril, 1.5F);
158-
}
159154
return true;
160155
}
161156

‎src/main/java/cofh/thermalfoundation/block/BlockRockwool.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public boolean initialize() {
126126
@Override
127127
public boolean register() {
128128

129-
addSmelting(ItemMaterial.crystalSlag, rockwoolSilver);
129+
addSmelting(ItemMaterial.crystalSlag, rockwoolSilver, 0.1F);
130130

131131
for (int i = 0; i < 16; i++) {
132132
addShapelessRecipe(new ItemStack(this, 1, i), new ItemStack(this, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.DYE, 1, i));

‎src/main/java/cofh/thermalfoundation/gui/GuiHandler.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ public Object getClientGuiElement(int id, EntityPlayer player, World world, int
3030
}
3131
return null;
3232
case LEXICON_STUDY_ID:
33-
if (ItemHelper.isPlayerHoldingMainhand(TFItems.itemTome, player)) {
33+
if (ItemHelper.isPlayerHoldingMainhand(TFItems.itemTomeLexicon, player)) {
3434
return new GuiLexiconStudy(player.inventory, new ContainerLexiconStudy(player.getHeldItemMainhand(), player.inventory));
3535
}
3636
return null;
3737
case LEXICON_TRANSMUTE_ID:
38-
if (ItemHelper.isPlayerHoldingMainhand(TFItems.itemTome, player)) {
38+
if (ItemHelper.isPlayerHoldingMainhand(TFItems.itemTomeLexicon, player)) {
3939
return new GuiLexiconTransmute(player.inventory, new ContainerLexiconTransmute(player.inventory));
4040
}
4141
return null;
@@ -55,12 +55,12 @@ public Object getServerGuiElement(int id, EntityPlayer player, World world, int
5555
}
5656
return null;
5757
case LEXICON_STUDY_ID:
58-
if (ItemHelper.isPlayerHoldingMainhand(TFItems.itemTome, player)) {
58+
if (ItemHelper.isPlayerHoldingMainhand(TFItems.itemTomeLexicon, player)) {
5959
return new ContainerLexiconStudy(player.getHeldItemMainhand(), player.inventory);
6060
}
6161
return null;
6262
case LEXICON_TRANSMUTE_ID:
63-
if (ItemHelper.isPlayerHoldingMainhand(TFItems.itemTome, player)) {
63+
if (ItemHelper.isPlayerHoldingMainhand(TFItems.itemTomeLexicon, player)) {
6464
return new ContainerLexiconTransmute(player.inventory);
6565
}
6666
return null;

‎src/main/java/cofh/thermalfoundation/init/TFItems.java‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
import cofh.core.util.core.IInitializer;
44
import cofh.thermalfoundation.item.*;
5+
import cofh.thermalfoundation.item.diagram.ItemDiagram;
6+
import cofh.thermalfoundation.item.diagram.ItemDiagramRedprint;
7+
import cofh.thermalfoundation.item.tome.ItemTome;
8+
import cofh.thermalfoundation.item.tome.ItemTomeExperience;
9+
import cofh.thermalfoundation.item.tome.ItemTomeLexicon;
510
import cofh.thermalfoundation.util.TFCrafting;
611
import net.minecraft.item.Item;
712
import net.minecraft.item.crafting.IRecipe;
@@ -27,9 +32,10 @@ public static void preInit() {
2732
itemWrench = new ItemWrench();
2833
itemMeter = new ItemMeter();
2934
itemUpgrade = new ItemUpgrade();
30-
itemTome = new ItemTome();
3135
itemSecurity = new ItemSecurity();
32-
itemDiagram = new ItemDiagram();
36+
itemDiagramRedprint = new ItemDiagramRedprint();
37+
itemTomeLexicon = new ItemTomeLexicon();
38+
itemTomeExperience = new ItemTomeExperience();
3339
itemCoin = new ItemCoin();
3440
itemFertilizer = new ItemFertilizer();
3541
itemBait = new ItemBait();
@@ -39,9 +45,10 @@ public static void preInit() {
3945
initList.add(itemWrench);
4046
initList.add(itemMeter);
4147
initList.add(itemUpgrade);
42-
initList.add(itemTome);
4348
initList.add(itemSecurity);
44-
initList.add(itemDiagram);
49+
initList.add(itemDiagramRedprint);
50+
initList.add(itemTomeLexicon);
51+
initList.add(itemTomeExperience);
4552
initList.add(itemCoin);
4653
initList.add(itemFertilizer);
4754
initList.add(itemBait);
@@ -70,6 +77,10 @@ public void missingMapping(RegistryEvent.MissingMappings<Item> event) {
7077
for (MissingMappings.Mapping<Item> entry : event.getAllMappings()) {
7178
if (entry.key.toString().equals("thermalexpansion:upgrade")) {
7279
entry.remap(ForgeRegistries.ITEMS.getValue(new ResourceLocation("thermalfoundation:upgrade")));
80+
} else if (entry.key.toString().equals("thermalfoundation:diagram")) {
81+
entry.remap(ForgeRegistries.ITEMS.getValue(new ResourceLocation("thermalfoundation:diagram_redprint")));
82+
} else if (entry.key.toString().equals("thermalfoundation:tome")) {
83+
entry.remap(ForgeRegistries.ITEMS.getValue(new ResourceLocation("thermalfoundation:tome_lexicon")));
7384
}
7485
}
7586
}
@@ -80,9 +91,10 @@ public void missingMapping(RegistryEvent.MissingMappings<Item> event) {
8091
public static ItemWrench itemWrench;
8192
public static ItemMeter itemMeter;
8293
public static ItemUpgrade itemUpgrade;
83-
public static ItemTome itemTome;
8494
public static ItemSecurity itemSecurity;
85-
public static ItemDiagram itemDiagram;
95+
public static ItemDiagram itemDiagramRedprint;
96+
public static ItemTome itemTomeLexicon;
97+
public static ItemTome itemTomeExperience;
8698
public static ItemCoin itemCoin;
8799
public static ItemBait itemBait;
88100
public static ItemFertilizer itemFertilizer;

‎src/main/java/cofh/thermalfoundation/init/TFProps.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,13 @@ private static void addWorldGeneration() {
225225
public static boolean showDisabledEquipment = false;
226226

227227
/* GENERAL */
228+
public static final String EXPERIENCE_TIMER = "thermalfoundation.experience_timer";
229+
228230
public static final String LEXICON_TIMER = "thermalfoundation.lexicon_timer";
229231
public static final String LEXICON_DATA = "thermalfoundation.lexicon_data";
230232

231-
public static final int MAX_EXP_LEVEL = 100;
232-
public static final int MAX_EXP = (9 * MAX_EXP_LEVEL * MAX_EXP_LEVEL - 325 * MAX_EXP_LEVEL + 4440) / 2;
233+
// public static final int MAX_EXP_LEVEL = 100;
234+
// public static final int MAX_EXP = (9 * MAX_EXP_LEVEL * MAX_EXP_LEVEL - 325 * MAX_EXP_LEVEL + 4440) / 2;
233235

234236
public static final byte LEVEL_MIN = 0;
235237
public static final byte LEVEL_MAX = 4;

‎src/main/java/cofh/thermalfoundation/item/ItemDiagram.java‎

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

0 commit comments

Comments
 (0)