Skip to content

Commit

Permalink
Update required Forge version, remove old textures for bucket for pre…
Browse files Browse the repository at this point in the history
… 1.12.2
  • Loading branch information
KnightMiner committed Mar 24, 2018
1 parent e1740a9 commit c5d6904
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 77 deletions.
4 changes: 2 additions & 2 deletions src/main/java/knightminer/tcomplement/TinkersComplement.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
modid = TinkersComplement.modID,
name = TinkersComplement.modName,
version = TinkersComplement.modVersion,
dependencies = "required-after:forge;"
dependencies = "required-after:forge@[14.23.1.2574,);"
+ "required-after:mantle;"
+ "required-after:tconstruct@[1.12-2.7.4.38,);"
+ "after:chisel@[MC1.12-0.1.0.22,);"
+ "after:exnihilocreatio",
acceptedMinecraftVersions = "[1.12, 1.13)")
acceptedMinecraftVersions = "[1.12.2, 1.13)")
public class TinkersComplement {
public static final String modID = "tcomplement";
public static final String modVersion = "${version}";
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/knightminer/tcomplement/common/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import knightminer.tcomplement.TinkersComplement;
import net.minecraft.util.JsonUtils;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.crafting.IConditionFactory;
import net.minecraftforge.common.crafting.JsonContext;
Expand All @@ -20,9 +19,6 @@ public class Config {
public static float oreToIngotRatio = 1.0f;
public static boolean blacklistMelterStone = true;

//client
public static boolean oldBucketTexture = false;


static Configuration configFile;

Expand All @@ -35,9 +31,6 @@ public static void load(FMLPreInitializationEvent event) {
oreToIngotRatio = configFile.getFloat("oreToIngotRatio", "melter", 1.0f, 0f, 16.0f,
"Ratio of ore to material produced in the melter.");

// client
oldBucketTexture = MinecraftForge.MC_VERSION.equals("1.12") || MinecraftForge.MC_VERSION.equals("1.12.1");

if(configFile.hasChanged()) {
configFile.save();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
import knightminer.tcomplement.common.CommonProxy;
import knightminer.tcomplement.common.PulseBase;
import knightminer.tcomplement.library.TCompRegistry;
import knightminer.tcomplement.shared.item.ItemCast;
import knightminer.tcomplement.shared.item.ItemMaterials;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.event.RegistryEvent.Register;
Expand Down Expand Up @@ -43,11 +41,11 @@ public void registerItems(Register<Item> event) {
IForgeRegistry<Item> r = event.getRegistry();

// materials
materials = registerItem(r, new ItemMaterials(), "materials");
materials = registerItem(r, new ItemMetaDynamic(), "materials");
materials.setCreativeTab(TCompRegistry.tabGeneral);

// custom casts
castCustom = registerItem(r, new ItemCast(), "cast");
castCustom = registerItem(r, new CastCustom(), "cast");
castCustom.setCreativeTab(TCompRegistry.tabGeneral);

if(isFeaturesLoaded()) {
Expand Down
30 changes: 0 additions & 30 deletions src/main/java/knightminer/tcomplement/shared/item/ItemCast.java

This file was deleted.

This file was deleted.

3 changes: 1 addition & 2 deletions src/main/resources/assets/tcomplement/blockstates/cast.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"model": "forge:item-layer"
},
"variants": {
"bucket": [{ "textures": { "layer0": "tcomplement:items/materials/cast_bucket" }}],
"bucket_old": [{ "textures": { "layer0": "tcomplement:items/materials/cast_bucket_old" }}]
"bucket": [{ "textures": { "layer0": "tcomplement:items/materials/cast_bucket" }}]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"model": "forge:item-layer"
},
"variants": {
"stone_bucket": [{ "textures": { "layer0": "tcomplement:items/materials/stone_bucket" }}],
"stone_bucket_old": [{ "textures": { "layer0": "tcomplement:items/materials/stone_bucket_old" }}]
"stone_bucket": [{ "textures": { "layer0": "tcomplement:items/materials/stone_bucket" }}]
}
}
Binary file not shown.
Binary file not shown.

0 comments on commit c5d6904

Please sign in to comment.