Jotunn/TAIGA-Obsidiorite-Heroic-Fixes
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

More textures!

Browse Source
This commit is contained in:
Robert Sosnitzka
2016-05-13 12:22:36 +02:00
parent 10e5eedd78
commit 5ce3d8c317
5 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/sosnitzka/ztic_addon/main/ZTiC.java
View File

@@ -68,7 +68,7 @@ public class ZTiC {
public static Item vibraniumIngot = new BasicItem("vibranium_ingot");
public static Item yrdeanIngot = new BasicItem("yrdean_ingot");
public static Item astriteIngot = new BasicItem("astrite_ingot");
public static Item astriumIngot = new BasicItem("astrium_ingot");
public static Item instableNitroniteIngot = new BasicItem("instable_nitronite_ingot");
public static Item proxideumIngot = new BasicItem("proxideum_ingot");
public static Item instablePolyniumIngot = new BasicItem("instable_polyniumingot");
@@ -131,7 +131,7 @@ public class ZTiC {
public static slimeknights.tconstruct.library.materials.Material eternite = new slimeknights.tconstruct.library.materials.Material("eternite", TextFormatting.AQUA);
public static slimeknights.tconstruct.library.materials.Material mythril = new slimeknights.tconstruct.library.materials.Material("mythril", TextFormatting.AQUA);
public static slimeknights.tconstruct.library.materials.Material astrite = new slimeknights.tconstruct.library.materials.Material("astrite", TextFormatting.LIGHT_PURPLE);
public static slimeknights.tconstruct.library.materials.Material astrium = new slimeknights.tconstruct.library.materials.Material("astrium", TextFormatting.LIGHT_PURPLE);
public static slimeknights.tconstruct.library.materials.Material instableNitronite = new slimeknights.tconstruct.library.materials.Material("instableNitronite", TextFormatting.LIGHT_PURPLE);
public static slimeknights.tconstruct.library.materials.Material proxideum = new slimeknights.tconstruct.library.materials.Material("proxideum", TextFormatting.LIGHT_PURPLE);
public static slimeknights.tconstruct.library.materials.Material instablePolynium = new slimeknights.tconstruct.library.materials.Material("instablePolynium", TextFormatting.LIGHT_PURPLE);
@@ -147,6 +147,7 @@ public class ZTiC {
public static slimeknights.tconstruct.library.materials.Material radiantPlinium = new slimeknights.tconstruct.library.materials.Material("radiantPlinium", TextFormatting.AQUA);
public static slimeknights.tconstruct.library.materials.Material dysprosanium = new slimeknights.tconstruct.library.materials.Material("dysprosanium", TextFormatting.AQUA);
public static slimeknights.tconstruct.library.materials.Material refractiveBysmuid = new slimeknights.tconstruct.library.materials.Material("refractiveBysmuidFluid", TextFormatting.AQUA);
@SidedProxy(clientSide = "com.sosnitzka.ztic_addon.proxy.ClientProxy", serverSide = "com.sosnitzka.ztic_addon.proxy.ServerProxy")
private static ServerProxy proxy;
private List<MaterialIntegration> integrateList = Lists.newArrayList();
@@ -189,7 +190,7 @@ public class ZTiC {
GameRegistry.register(vibraniumIngot);
GameRegistry.register(yrdeanIngot);
GameRegistry.register(astriteIngot);
GameRegistry.register(astriumIngot);
GameRegistry.register(instableDyoniteIngot);
GameRegistry.register(instableNitroniteIngot);
GameRegistry.register(instablePolyniumIngot);
@@ -271,8 +272,8 @@ public class ZTiC {
// TConstruct Alloys
Fluid astriteFluid = new BasicFluid("astriteFluid", 0xFF7a3b74);
registerTinkerAlloys("Astrite", astriteFluid, true, 200, 10, 4000, 1, arcaniteFluid, 3, karmesineFluid, 2);
Fluid astriumFluid = new BasicFluid("astriumFluid", 0xFF7a3b74);
registerTinkerAlloys("Astrium", astriumFluid, true, 200, 10, 4000, 1, arcaniteFluid, 3, karmesineFluid, 2);
Fluid instableNitroniteFluid = new BasicFluid("instableNitroniteFluid", 0xFF659933);
registerTinkerAlloys("InstableNitronite", instableNitroniteFluid, true, 200, 10, 4000, 1, tiberiumFluid, 5, vibraniumFluid, 3);
Fluid proxideumFluid = new BasicFluid("proxideumFluid", 0xFF416565);
@@ -324,7 +325,7 @@ public class ZTiC {
registerTinkerMaterial("Mythril", mythril, mythrilFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
// Material from alloys
registerTinkerMaterial("Astrite", astrite, astriteFluid, 1, 5, 6, 7, 0.8f, 0, 100, false, true);
registerTinkerMaterial("Astrium", astrium, astriumFluid, 1, 5, 6, 7, 0.8f, 0, 100, false, true);
registerTinkerMaterial("InstableNitronite", instableNitronite, instableNitroniteFluid, 1, 5, 6, 6, 0.8f, 0, 100, false, true);
registerTinkerMaterial("Proxideum", proxideum, proxideumFluid, 1, 5, 6, 5, 0.8f, 0, 100, false, true);
registerTinkerMaterial("InstablePolynium", instablePolynium, instablePolyniumFluid, 1, 5, 6, 4, 0.8f, 0, 100, false, true);
@@ -368,7 +369,7 @@ public class ZTiC {
OreDictionary.registerOre("oreAardium", aardiumOre);
OreDictionary.registerOre("ingotAardium", aardiumIngot);
OreDictionary.registerOre("ingotAstrite", astriteIngot);
OreDictionary.registerOre("ingotAstrium", astriumIngot);
OreDictionary.registerOre("oreArcanite", arcaniteOre);
OreDictionary.registerOre("ingotArcanite", arcaniteIngot);
OreDictionary.registerOre("oreAdamantite", adamantiteOre);

2
src/main/java/com/sosnitzka/ztic_addon/proxy/ClientProxy.java
View File

@@ -46,7 +46,7 @@ public class ClientProxy extends ServerProxy {
registerItemModel(vibraniumIngot);
registerItemModel(yrdeanIngot);
registerItemModel(astriteIngot);
registerItemModel(astriumIngot);
registerItemModel(instableDyoniteIngot);
registerItemModel(instableNitroniteIngot);
registerItemModel(instablePolyniumIngot);

16
src/main/resources/assets/ztic_addon/blockstates/fluids.json
View File

@@ -1,16 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "forge:fluid",
"transform": "forge:default-item"
},
"variants": {
"moltenAardium": [
{
"custom": {
"fluid": "fluid_aardium"
}
}
]
}
}

2
src/main/resources/assets/ztic_addon/models/block/astrite_ore.json
View File

@@ -1,6 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "ztic_addon:blocks/astrite_ore"
"all": "ztic_addon:blocks/astrium_ore"
}
}

2
src/main/resources/assets/ztic_addon/models/item/astrite_ingot.json
View File

@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "ztic_addon:items/astrite_ingot"
"layer0": "ztic_addon:items/astrium_ingot"
}
}