Updated forge

This commit is contained in:
drcrazy 2018-08-22 15:55:14 +03:00
parent 2e4c3ebf1a
commit be024f0179
21 changed files with 187 additions and 399 deletions

View file

@ -43,7 +43,7 @@ if (ENV.BUILD_NUMBER) {
} }
minecraft { minecraft {
version = "1.12.2-14.23.4.2739" version = "1.12.2-14.23.4.2757"
mappings = "snapshot_20180720" mappings = "snapshot_20180720"
replace "@MODVERSION@", project.version replace "@MODVERSION@", project.version
useDepAts = true useDepAts = true

View file

@ -30,10 +30,8 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.world.gen.structure.MapGenStructureIO; import net.minecraft.world.gen.structure.MapGenStructureIO;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ModFixs;
import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.SidedProxy;
@ -133,7 +131,7 @@ public class Core {
@SubscribeEvent @SubscribeEvent
public void registerItems(RegistryEvent.Register<Item> event) { public void registerItems(RegistryEvent.Register<Item> event) {
IForgeRegistry<Item> itemRegistry = event.getRegistry(); IForgeRegistry<Item> itemRegistry = event.getRegistry();
Arrays.stream(ModPlates.values()).forEach(modPlate -> itemRegistry.register(modPlate.item)); Arrays.stream(ModPlates.values()).forEach(plate -> itemRegistry.register(plate.item));
} }
@Mod.EventHandler @Mod.EventHandler

View file

@ -139,12 +139,9 @@ public class RegisterItemJsons {
}*/ }*/
ResourceLocation platesBlockstateJson = new ResourceLocation(ModInfo.MOD_ID, "items/materials/plates");
for (ModPlates plate : ModPlates.values()){ for (ModPlates plate : ModPlates.values()){
ResourceLocation platesJson = new ResourceLocation(ModInfo.MOD_ID, "items/materials/plates/" + plate.name.getPath()); ModelLoader.setCustomModelResourceLocation(plate.item, 0, new ModelResourceLocation(platesBlockstateJson, "type=" + plate.getName()));
ModelLoader.setCustomModelResourceLocation(plate.item, 0, new ModelResourceLocation(platesJson, "inventory"));
//registerBlockstateMultiItem(plate.item, plate.name.getPath(), "items/materials/plates");
} }
name = ItemNuggets.types.clone(); name = ItemNuggets.types.clone();

View file

@ -24,6 +24,8 @@
package techreborn.init; package techreborn.init;
import net.minecraft.item.Item;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import techreborn.items.ItemPlates; import techreborn.items.ItemPlates;
@ -33,33 +35,37 @@ import techreborn.items.ItemPlates;
* @author drcrazy * @author drcrazy
* *
*/ */
public enum ModPlates { public enum ModPlates implements IStringSerializable {
ADVANCED_ALLOY_PLATE("plateAdvancedAlloy"), ADVANCED_ALLOY_PLATE("plateAdvancedAlloy"),
ALUMINUM_PLATE("plateAluminum"), ALUMINUM_PLATE("plateAluminum"),
BRASS_PLATE("plateBrass"), // BRASS_PLATE("plateBrass"),
BRONZE_PLATE("plateBronze"), // BRONZE_PLATE("plateBronze"),
CARBON_PLATE("plateCarbon"), // CARBON_PLATE("plateCarbon"),
COAL_PLATE("plateCoal"), // COAL_PLATE("plateCoal"),
COPPER_PLATE("plateCopper"), // COPPER_PLATE("plateCopper"),
DIAMOND_PLATE("plateDiamond"), // DIAMOND_PLATE("plateDiamond"),
//
IRON_PLATE("plateIron"), // IRON_PLATE("plateIron"),
GOLD_PLATE("plateGold"), // GOLD_PLATE("plateGold"),
//
WOOD_PLATE("plateWood"), // WOOD_PLATE("plateWood"),
REDSTONE_PLATE("plateRedstone"), // REDSTONE_PLATE("plateRedstone"),
//
EMERALD_PLATE("plateEmerald"), // EMERALD_PLATE("plateEmerald"),
//
OBSIDIAN_PLATE("plateObsidian"), // OBSIDIAN_PLATE("plateObsidian"),
LAZURITE_PLATE("plateLazurite"); LAZURITE_PLATE("plateLazurite");
public ResourceLocation name; public final ResourceLocation name;
public ItemPlates item; public final Item item;
ModPlates(String name) { private ModPlates(String name) {
this.name = new ResourceLocation(ModInfo.MOD_ID, name); this.name = new ResourceLocation(ModInfo.MOD_ID, name);
this.item = new ItemPlates(); this.item = new ItemPlates(this.name);
this.item.setRegistryName(this.name); }
@Override
public String getName() {
return name.getPath();
} }
} }

View file

@ -28,9 +28,11 @@ import com.google.common.base.CaseFormat;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.OreUtil; import reborncore.common.util.OreUtil;
import techreborn.events.TRRecipeHandler; import techreborn.events.TRRecipeHandler;
import techreborn.init.ModItems; import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import techreborn.utils.TechRebornCreativeTab; import techreborn.utils.TechRebornCreativeTab;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
@ -42,10 +44,12 @@ public class ItemPlates extends ItemTR {
"iron", "gold", "carbon", "wood", "redstone", "diamond", "emerald", "coal", "obsidian", "lazurite" "iron", "gold", "carbon", "wood", "redstone", "diamond", "emerald", "coal", "obsidian", "lazurite"
}; };
public ItemPlates() { public ItemPlates(ResourceLocation name) {
setRegistryName(name);
setTranslationKey(ModInfo.MOD_ID + "." + name.getPath());
TRRecipeHandler.hideEntry(this);
//setTranslationKey("techreborn.plate"); //setTranslationKey("techreborn.plate");
//setHasSubtypes(true); //setHasSubtypes(true);
TRRecipeHandler.hideEntry(this);
} }
// public static ItemStack getPlateByName(String name, int count) { // public static ItemStack getPlateByName(String name, int count) {
@ -75,26 +79,4 @@ public class ItemPlates extends ItemTR {
// String oreName = "plate" + CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, plateType); // String oreName = "plate" + CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, plateType);
// OreUtil.registerOre(oreName, new ItemStack(ModItems.PLATES, 1, plateIndex)); // OreUtil.registerOre(oreName, new ItemStack(ModItems.PLATES, 1, plateIndex));
// } // }
/* @Override
// gets Unlocalized Name depending on meta data
public String getTranslationKey(ItemStack itemStack) {
int meta = itemStack.getItemDamage();
if (meta < 0 || meta >= types.length) {
meta = 0;
}
return super.getTranslationKey() + "." + types[meta];
}*/
/* // Adds Dusts SubItems To Creative Tab
@Override
public void getSubItems(CreativeTabs creativeTabs, NonNullList<ItemStack> list) {
if (!isInCreativeTab(creativeTabs)) {
return;
}
for (int meta = 0; meta < types.length; ++meta) {
list.add(new ItemStack(this, 1, meta));
}
}*/
} }

View file

@ -1,136 +1,151 @@
{ {
"forge_marker": 1, "forge_marker": 1,
"defaults": { "defaults": {
"model": "builtin/generated", "model": "builtin/generated",
"transform": "forge:default-item" "transform": "forge:default-item"
}, },
"variants": { "variants": {
"type": { "type": {
"chrome": { "plateadvancedalloy": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/chrome_plate" "layer0": "techreborn:items/plate/advanced_alloy_plate"
} }
}, },
"electrum": { "platealuminum": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/electrum_plate" "layer0": "techreborn:items/plate/aluminum_plate"
} }
}, },
"invar": { "platelazurite": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/invar_plate" "layer0": "techreborn:items/plate/lazurite_plate"
} }
}, },
"iridium": { "chrome": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/iridium_plate" "layer0": "techreborn:items/plate/chrome_plate"
} }
}, },
"lead": { "electrum": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/lead_plate" "layer0": "techreborn:items/plate/electrum_plate"
} }
}, },
"nickel": { "invar": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/nickel_plate" "layer0": "techreborn:items/plate/invar_plate"
} }
}, },
"platinum": { "iridium": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/platinum_plate" "layer0": "techreborn:items/plate/iridium_plate"
} }
}, },
"silver": { "lead": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/silver_plate" "layer0": "techreborn:items/plate/lead_plate"
} }
}, },
"steel": { "nickel": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/steel_plate" "layer0": "techreborn:items/plate/nickel_plate"
} }
}, },
"tin": { "platinum": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/tin_plate" "layer0": "techreborn:items/plate/platinum_plate"
} }
}, },
"titanium": { "silver": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/titanium_plate" "layer0": "techreborn:items/plate/silver_plate"
} }
}, },
"tungsten": { "steel": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/tungsten_plate" "layer0": "techreborn:items/plate/steel_plate"
} }
}, },
"hot_tungstensteel": { "tin": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/hot_tungstensteel_plate" "layer0": "techreborn:items/plate/tin_plate"
} }
}, },
"tungstensteel": { "titanium": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/tungstensteel_plate" "layer0": "techreborn:items/plate/titanium_plate"
} }
}, },
"zinc": { "tungsten": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/zinc_plate" "layer0": "techreborn:items/plate/tungsten_plate"
} }
}, },
"refined_iron": { "hot_tungstensteel": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/refined_iron_plate" "layer0": "techreborn:items/plate/hot_tungstensteel_plate"
} }
}, },
"mixed_metal": { "tungstensteel": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/mixed_metal_plate" "layer0": "techreborn:items/plate/tungstensteel_plate"
} }
}, },
"iridium_alloy": { "zinc": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/iridium_alloy_plate" "layer0": "techreborn:items/plate/zinc_plate"
} }
}, },
"lapis": { "refined_iron": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/lapis_plate" "layer0": "techreborn:items/plate/refined_iron_plate"
} }
}, },
"ruby": { "mixed_metal": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/ruby_plate" "layer0": "techreborn:items/plate/mixed_metal_plate"
} }
}, },
"sapphire": { "iridium_alloy": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/sapphire_plate" "layer0": "techreborn:items/plate/iridium_alloy_plate"
} }
}, },
"peridot": { "lapis": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/peridot_plate" "layer0": "techreborn:items/plate/lapis_plate"
} }
}, },
"red_garnet": { "ruby": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/red_garnet_plate" "layer0": "techreborn:items/plate/ruby_plate"
} }
}, },
"yellow_garnet": { "sapphire": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/yellow_garnet_plate" "layer0": "techreborn:items/plate/sapphire_plate"
} }
}, },
"magnalium": { "peridot": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/magnalium_plate" "layer0": "techreborn:items/plate/peridot_plate"
} }
} },
} "red_garnet": {
} "textures": {
"layer0": "techreborn:items/plate/red_garnet_plate"
}
},
"yellow_garnet": {
"textures": {
"layer0": "techreborn:items/plate/yellow_garnet_plate"
}
},
"magnalium": {
"textures": {
"layer0": "techreborn:items/plate/magnalium_plate"
}
}
}
}
} }

View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "techreborn:items/plate/advanced_alloy_plate"
}
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "techreborn:items/plate/aluminum_plate"
}
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "techreborn:items/plate/brass_plate"
}
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "techreborn:items/plate/bronze_plate"
}
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "techreborn:items/plate/carbon_plate"
}
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "techreborn:items/plate/coal_plate"
}
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "techreborn:items/plate/copper_plate"
}
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "techreborn:items/plate/diamond_plate"
}
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "techreborn:items/plate/emerald_plate"
}
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "techreborn:items/plate/gold_plate"
}
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "techreborn:items/plate/iron_plate"
}
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "techreborn:items/plate/lazurite_plate"
}
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "techreborn:items/plate/obsidian_plate"
}
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "techreborn:items/plate/redstone_plate"
}
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}

View file

@ -1,14 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "techreborn:items/plate/wood_plate"
}
},
"variants": {
"normal": [{}],
"inventory": [{}]
}
}