diff --git a/src/main/java/com/pahimar/ee3/array/AlchemyArrayAccelerant.java b/src/main/java/com/pahimar/ee3/array/AlchemyArrayAccelerant.java new file mode 100644 index 00000000..4ca47cd6 --- /dev/null +++ b/src/main/java/com/pahimar/ee3/array/AlchemyArrayAccelerant.java @@ -0,0 +1,12 @@ +package com.pahimar.ee3.array; + +import com.pahimar.ee3.reference.Names; +import com.pahimar.ee3.reference.Textures; + +public class AlchemyArrayAccelerant extends AlchemyArrayEE +{ + public AlchemyArrayAccelerant() + { + super(Textures.AlchemyArray.ACCELERANT_ALCHEMY_ARRAY, Names.AlchemyArrays.ACCELERANT_ALCHEMY_ARRAY); + } +} diff --git a/src/main/java/com/pahimar/ee3/array/AlchemyArrayCombustion.java b/src/main/java/com/pahimar/ee3/array/AlchemyArrayCombustion.java new file mode 100644 index 00000000..4c2f1db9 --- /dev/null +++ b/src/main/java/com/pahimar/ee3/array/AlchemyArrayCombustion.java @@ -0,0 +1,12 @@ +package com.pahimar.ee3.array; + +import com.pahimar.ee3.reference.Names; +import com.pahimar.ee3.reference.Textures; + +public class AlchemyArrayCombustion extends AlchemyArrayEE +{ + public AlchemyArrayCombustion() + { + super(Textures.AlchemyArray.COMBUSTION_ALCHEMY_ARRAY, Names.AlchemyArrays.COMBUSTION_ALCHEMY_ARRAY); + } +} diff --git a/src/main/java/com/pahimar/ee3/array/AlchemyArrayConstruction.java b/src/main/java/com/pahimar/ee3/array/AlchemyArrayConstruction.java new file mode 100644 index 00000000..97f9fa31 --- /dev/null +++ b/src/main/java/com/pahimar/ee3/array/AlchemyArrayConstruction.java @@ -0,0 +1,12 @@ +package com.pahimar.ee3.array; + +import com.pahimar.ee3.reference.Names; +import com.pahimar.ee3.reference.Textures; + +public class AlchemyArrayConstruction extends AlchemyArrayEE +{ + public AlchemyArrayConstruction() + { + super(Textures.AlchemyArray.CONSTRUCTION_ALCHEMY_ARRAY, Names.AlchemyArrays.CONSTRUCTION_ALCHEMY_ARRAY); + } +} diff --git a/src/main/java/com/pahimar/ee3/array/AlchemyArrayConveyor.java b/src/main/java/com/pahimar/ee3/array/AlchemyArrayConveyor.java new file mode 100644 index 00000000..82bce56f --- /dev/null +++ b/src/main/java/com/pahimar/ee3/array/AlchemyArrayConveyor.java @@ -0,0 +1,12 @@ +package com.pahimar.ee3.array; + +import com.pahimar.ee3.reference.Names; +import com.pahimar.ee3.reference.Textures; + +public class AlchemyArrayConveyor extends AlchemyArrayEE +{ + public AlchemyArrayConveyor() + { + super(Textures.AlchemyArray.CONVEYOR_ALCHEMY_ARRAY, Names.AlchemyArrays.CONVEYOR_ALCHEMY_ARRAY); + } +} diff --git a/src/main/java/com/pahimar/ee3/array/AlchemyArrayDestruction.java b/src/main/java/com/pahimar/ee3/array/AlchemyArrayDestruction.java new file mode 100644 index 00000000..2945d629 --- /dev/null +++ b/src/main/java/com/pahimar/ee3/array/AlchemyArrayDestruction.java @@ -0,0 +1,12 @@ +package com.pahimar.ee3.array; + +import com.pahimar.ee3.reference.Names; +import com.pahimar.ee3.reference.Textures; + +public class AlchemyArrayDestruction extends AlchemyArrayEE +{ + public AlchemyArrayDestruction() + { + super(Textures.AlchemyArray.DESTRUCTION_ALCHEMY_ARRAY, Names.AlchemyArrays.DESTRUCTION_ALCHEMY_ARRAY); + } +} diff --git a/src/main/java/com/pahimar/ee3/array/AlchemyArrayEE.java b/src/main/java/com/pahimar/ee3/array/AlchemyArrayEE.java index cd55efd1..7ea8a597 100644 --- a/src/main/java/com/pahimar/ee3/array/AlchemyArrayEE.java +++ b/src/main/java/com/pahimar/ee3/array/AlchemyArrayEE.java @@ -3,7 +3,7 @@ package com.pahimar.ee3.array; import com.pahimar.ee3.api.array.AlchemyArray; import net.minecraft.util.ResourceLocation; -public class AlchemyArrayEE extends AlchemyArray +public abstract class AlchemyArrayEE extends AlchemyArray { public AlchemyArrayEE(ResourceLocation texture, String unlocalizedName) { diff --git a/src/main/java/com/pahimar/ee3/array/AlchemyArrayGelid.java b/src/main/java/com/pahimar/ee3/array/AlchemyArrayGelid.java new file mode 100644 index 00000000..83a4d154 --- /dev/null +++ b/src/main/java/com/pahimar/ee3/array/AlchemyArrayGelid.java @@ -0,0 +1,12 @@ +package com.pahimar.ee3.array; + +import com.pahimar.ee3.reference.Names; +import com.pahimar.ee3.reference.Textures; + +public class AlchemyArrayGelid extends AlchemyArrayEE +{ + public AlchemyArrayGelid() + { + super(Textures.AlchemyArray.GELID_ALCHEMY_ARRAY, Names.AlchemyArrays.GELID_ALCHEMY_ARRAY); + } +} diff --git a/src/main/java/com/pahimar/ee3/array/AlchemyArrayParthenogenesis.java b/src/main/java/com/pahimar/ee3/array/AlchemyArrayParthenogenesis.java new file mode 100644 index 00000000..5a84d3a8 --- /dev/null +++ b/src/main/java/com/pahimar/ee3/array/AlchemyArrayParthenogenesis.java @@ -0,0 +1,12 @@ +package com.pahimar.ee3.array; + +import com.pahimar.ee3.reference.Names; +import com.pahimar.ee3.reference.Textures; + +public class AlchemyArrayParthenogenesis extends AlchemyArrayEE +{ + public AlchemyArrayParthenogenesis() + { + super(Textures.AlchemyArray.PARTHENOGENESIS_ALCHEMY_ARRAY, Names.AlchemyArrays.PARTHENOGENESIS_ALCHEMY_ARRAY); + } +} diff --git a/src/main/java/com/pahimar/ee3/array/AlchemyArrayTransfiguration.java b/src/main/java/com/pahimar/ee3/array/AlchemyArrayTransfiguration.java new file mode 100644 index 00000000..15f4514f --- /dev/null +++ b/src/main/java/com/pahimar/ee3/array/AlchemyArrayTransfiguration.java @@ -0,0 +1,12 @@ +package com.pahimar.ee3.array; + +import com.pahimar.ee3.reference.Names; +import com.pahimar.ee3.reference.Textures; + +public class AlchemyArrayTransfiguration extends AlchemyArrayEE +{ + public AlchemyArrayTransfiguration() + { + super(Textures.AlchemyArray.TRANSFIGURATION_ALCHEMY_ARRAY, Names.AlchemyArrays.TRANSFIGURATION_ALCHEMY_ARRAY); + } +} diff --git a/src/main/java/com/pahimar/ee3/array/TransmutationAlchemyArray.java b/src/main/java/com/pahimar/ee3/array/AlchemyArrayTransmutation.java similarity index 99% rename from src/main/java/com/pahimar/ee3/array/TransmutationAlchemyArray.java rename to src/main/java/com/pahimar/ee3/array/AlchemyArrayTransmutation.java index c23d64c4..5a30df3e 100644 --- a/src/main/java/com/pahimar/ee3/array/TransmutationAlchemyArray.java +++ b/src/main/java/com/pahimar/ee3/array/AlchemyArrayTransmutation.java @@ -22,11 +22,11 @@ import net.minecraftforge.common.util.ForgeDirection; import java.util.Random; -public class TransmutationAlchemyArray extends AlchemyArray implements IInventory +public class AlchemyArrayTransmutation extends AlchemyArray implements IInventory { private ItemStack[] inventory = new ItemStack[25]; - public TransmutationAlchemyArray() + public AlchemyArrayTransmutation() { super(Textures.AlchemyArray.TRANSMUTATION_ALCHEMY_ARRAY, Names.AlchemyArrays.TRANSMUTATION_ALCHEMY_ARRAY); } diff --git a/src/main/java/com/pahimar/ee3/init/AlchemyArrays.java b/src/main/java/com/pahimar/ee3/init/AlchemyArrays.java index f3606aa7..5abecf77 100644 --- a/src/main/java/com/pahimar/ee3/init/AlchemyArrays.java +++ b/src/main/java/com/pahimar/ee3/init/AlchemyArrays.java @@ -2,14 +2,30 @@ package com.pahimar.ee3.init; import com.pahimar.ee3.api.array.AlchemyArray; import com.pahimar.ee3.api.array.AlchemyArrayRegistryProxy; -import com.pahimar.ee3.array.TransmutationAlchemyArray; +import com.pahimar.ee3.array.*; public class AlchemyArrays { - public static final AlchemyArray transmutationAlchemyArray = new TransmutationAlchemyArray(); + public static final AlchemyArray accelerantAlchemyArray = new AlchemyArrayAccelerant(); + public static final AlchemyArray combustionAlchemyArray = new AlchemyArrayCombustion(); + public static final AlchemyArray constructionAlchemyArray = new AlchemyArrayConstruction(); + public static final AlchemyArray conveyorAlchemyArray = new AlchemyArrayConveyor(); + public static final AlchemyArray destructionAlchemyArray = new AlchemyArrayDestruction(); + public static final AlchemyArray gelidAlchemyArray = new AlchemyArrayGelid(); + public static final AlchemyArray parthenogenesisAlchemyArray = new AlchemyArrayParthenogenesis(); + public static final AlchemyArray transfigurationAlchemyArray = new AlchemyArrayTransfiguration(); + public static final AlchemyArray transmutationAlchemyArray = new AlchemyArrayTransmutation(); public static void registerAlchemyArrays() { + AlchemyArrayRegistryProxy.registerAlchemyArray(accelerantAlchemyArray); + AlchemyArrayRegistryProxy.registerAlchemyArray(combustionAlchemyArray); + AlchemyArrayRegistryProxy.registerAlchemyArray(constructionAlchemyArray); + AlchemyArrayRegistryProxy.registerAlchemyArray(conveyorAlchemyArray); + AlchemyArrayRegistryProxy.registerAlchemyArray(destructionAlchemyArray); + AlchemyArrayRegistryProxy.registerAlchemyArray(gelidAlchemyArray); + AlchemyArrayRegistryProxy.registerAlchemyArray(parthenogenesisAlchemyArray); + AlchemyArrayRegistryProxy.registerAlchemyArray(transfigurationAlchemyArray); AlchemyArrayRegistryProxy.registerAlchemyArray(transmutationAlchemyArray); } } diff --git a/src/main/java/com/pahimar/ee3/reference/Names.java b/src/main/java/com/pahimar/ee3/reference/Names.java index f780cf3c..2f472600 100644 --- a/src/main/java/com/pahimar/ee3/reference/Names.java +++ b/src/main/java/com/pahimar/ee3/reference/Names.java @@ -169,7 +169,14 @@ public class Names public static final class AlchemyArrays { private static final String ALCHEMY_ARRAY_BASE = "arrays.ee3:"; - public static final String BASIC_ALCHEMY_ARRAY = ALCHEMY_ARRAY_BASE + "test"; + public static final String ACCELERANT_ALCHEMY_ARRAY = ALCHEMY_ARRAY_BASE + "accelerant"; + public static final String COMBUSTION_ALCHEMY_ARRAY = ALCHEMY_ARRAY_BASE + "combustion"; + public static final String CONSTRUCTION_ALCHEMY_ARRAY = ALCHEMY_ARRAY_BASE + "construction"; + public static final String CONVEYOR_ALCHEMY_ARRAY = ALCHEMY_ARRAY_BASE + "conveyor"; + public static final String DESTRUCTION_ALCHEMY_ARRAY = ALCHEMY_ARRAY_BASE + "destruction"; + public static final String GELID_ALCHEMY_ARRAY = ALCHEMY_ARRAY_BASE + "gelid"; + public static final String PARTHENOGENESIS_ALCHEMY_ARRAY = ALCHEMY_ARRAY_BASE + "parthenogenesis"; + public static final String TRANSFIGURATION_ALCHEMY_ARRAY = ALCHEMY_ARRAY_BASE + "transfiguration"; public static final String TRANSMUTATION_ALCHEMY_ARRAY = ALCHEMY_ARRAY_BASE + "transmutation"; } } diff --git a/src/main/java/com/pahimar/ee3/reference/Textures.java b/src/main/java/com/pahimar/ee3/reference/Textures.java index af1d1bfb..157cd633 100644 --- a/src/main/java/com/pahimar/ee3/reference/Textures.java +++ b/src/main/java/com/pahimar/ee3/reference/Textures.java @@ -75,7 +75,14 @@ public final class Textures { private static final String SYMBOL_TEXTURE_LOCATION = "textures/arrays/"; - public static final ResourceLocation BASIC_ALCHEMY_ARRAY = ResourceLocationHelper.getResourceLocation(SYMBOL_TEXTURE_LOCATION + "test.png"); - public static final ResourceLocation TRANSMUTATION_ALCHEMY_ARRAY = ResourceLocationHelper.getResourceLocation(SYMBOL_TEXTURE_LOCATION + "transmutation.png"); + public static final ResourceLocation ACCELERANT_ALCHEMY_ARRAY = ResourceLocationHelper.getResourceLocation(SYMBOL_TEXTURE_LOCATION + "arrayAccelerant.png"); + public static final ResourceLocation COMBUSTION_ALCHEMY_ARRAY = ResourceLocationHelper.getResourceLocation(SYMBOL_TEXTURE_LOCATION + "arrayCombustion.png"); + public static final ResourceLocation CONSTRUCTION_ALCHEMY_ARRAY = ResourceLocationHelper.getResourceLocation(SYMBOL_TEXTURE_LOCATION + "arrayConstruction.png"); + public static final ResourceLocation CONVEYOR_ALCHEMY_ARRAY = ResourceLocationHelper.getResourceLocation(SYMBOL_TEXTURE_LOCATION + "arrayConveyor.png"); + public static final ResourceLocation DESTRUCTION_ALCHEMY_ARRAY = ResourceLocationHelper.getResourceLocation(SYMBOL_TEXTURE_LOCATION + "arrayDestruction.png"); + public static final ResourceLocation GELID_ALCHEMY_ARRAY = ResourceLocationHelper.getResourceLocation(SYMBOL_TEXTURE_LOCATION + "arrayGelid.png"); + public static final ResourceLocation PARTHENOGENESIS_ALCHEMY_ARRAY = ResourceLocationHelper.getResourceLocation(SYMBOL_TEXTURE_LOCATION + "arrayParthenogenesis.png"); + public static final ResourceLocation TRANSFIGURATION_ALCHEMY_ARRAY = ResourceLocationHelper.getResourceLocation(SYMBOL_TEXTURE_LOCATION + "arrayTransfiguration.png"); + public static final ResourceLocation TRANSMUTATION_ALCHEMY_ARRAY = ResourceLocationHelper.getResourceLocation(SYMBOL_TEXTURE_LOCATION + "arrayTransmutation.png"); } } diff --git a/src/main/resources/assets/ee3/lang/en_US.lang b/src/main/resources/assets/ee3/lang/en_US.lang index adc70dd4..0b2830bd 100644 --- a/src/main/resources/assets/ee3/lang/en_US.lang +++ b/src/main/resources/assets/ee3/lang/en_US.lang @@ -99,7 +99,14 @@ tile.ee3:transmutationTablet.name=Transmutation Tablet fluid.ee3.milk=Milk # Alchemy Arrays -arrays.ee3:basicAlchemyArray=Basic Alchemy Array [WIP] +arrays.ee3:accelerant=Accelerant Alchemy Array [WIP] +arrays.ee3:combustion=Combustion Alchemy Array [WIP] +arrays.ee3:construction=Construction Alchemy Array [WIP] +arrays.ee3:conveyor=Conveyor Alchemy Array [WIP] +arrays.ee3:destruction=Destruction Alchemy Array [WIP] +arrays.ee3:gelid=Gelid Alchemy Array [WIP] +arrays.ee3:parthenogenesis=Parthenogenesis Alchemy Array [WIP] +arrays.ee3:transfiguration=Transfiguration Alchemy Array [WIP] arrays.ee3:transmutation=Transmutation Alchemy Array [WIP] # GUIs diff --git a/src/main/resources/assets/ee3/textures/arrays/arrayAccelerant.png b/src/main/resources/assets/ee3/textures/arrays/arrayAccelerant.png new file mode 100644 index 00000000..f907609f Binary files /dev/null and b/src/main/resources/assets/ee3/textures/arrays/arrayAccelerant.png differ diff --git a/src/main/resources/assets/ee3/textures/arrays/arrayCombustion.png b/src/main/resources/assets/ee3/textures/arrays/arrayCombustion.png new file mode 100644 index 00000000..f4976bc9 Binary files /dev/null and b/src/main/resources/assets/ee3/textures/arrays/arrayCombustion.png differ diff --git a/src/main/resources/assets/ee3/textures/arrays/arrayConstruction.png b/src/main/resources/assets/ee3/textures/arrays/arrayConstruction.png new file mode 100644 index 00000000..ea94a600 Binary files /dev/null and b/src/main/resources/assets/ee3/textures/arrays/arrayConstruction.png differ diff --git a/src/main/resources/assets/ee3/textures/arrays/arrayConveyor.png b/src/main/resources/assets/ee3/textures/arrays/arrayConveyor.png new file mode 100644 index 00000000..310c32f4 Binary files /dev/null and b/src/main/resources/assets/ee3/textures/arrays/arrayConveyor.png differ diff --git a/src/main/resources/assets/ee3/textures/arrays/arrayDestruction.png b/src/main/resources/assets/ee3/textures/arrays/arrayDestruction.png new file mode 100644 index 00000000..a987e5af Binary files /dev/null and b/src/main/resources/assets/ee3/textures/arrays/arrayDestruction.png differ diff --git a/src/main/resources/assets/ee3/textures/arrays/arrayGelid.png b/src/main/resources/assets/ee3/textures/arrays/arrayGelid.png new file mode 100644 index 00000000..5159f4f9 Binary files /dev/null and b/src/main/resources/assets/ee3/textures/arrays/arrayGelid.png differ diff --git a/src/main/resources/assets/ee3/textures/arrays/arrayParthenogenesis.png b/src/main/resources/assets/ee3/textures/arrays/arrayParthenogenesis.png new file mode 100644 index 00000000..38386a1d Binary files /dev/null and b/src/main/resources/assets/ee3/textures/arrays/arrayParthenogenesis.png differ diff --git a/src/main/resources/assets/ee3/textures/arrays/arrayTransfiguration.png b/src/main/resources/assets/ee3/textures/arrays/arrayTransfiguration.png new file mode 100644 index 00000000..6118a1cd Binary files /dev/null and b/src/main/resources/assets/ee3/textures/arrays/arrayTransfiguration.png differ diff --git a/src/main/resources/assets/ee3/textures/arrays/arrayTransmutation.png b/src/main/resources/assets/ee3/textures/arrays/arrayTransmutation.png new file mode 100644 index 00000000..596571d2 Binary files /dev/null and b/src/main/resources/assets/ee3/textures/arrays/arrayTransmutation.png differ diff --git a/src/main/resources/assets/ee3/textures/arrays/test.png b/src/main/resources/assets/ee3/textures/arrays/test.png deleted file mode 100644 index c3136766..00000000 Binary files a/src/main/resources/assets/ee3/textures/arrays/test.png and /dev/null differ diff --git a/src/main/resources/assets/ee3/textures/arrays/transmutation.png b/src/main/resources/assets/ee3/textures/arrays/transmutation.png deleted file mode 100644 index 0e441b5c..00000000 Binary files a/src/main/resources/assets/ee3/textures/arrays/transmutation.png and /dev/null differ