Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Trying to get this thing working

Browse source
This commit is contained in:
Exidex 2017-09-10 22:56:06 +03:00
parent 414c346cb2
commit 91d14fdc52
23 changed files with 2098 additions and 2034 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
build.gradle
View file

@ -19,7 +19,7 @@ file "build.properties" withReader {
}
version = "${config.gt.version}"
group= "gregtech"
group = "gregtech"
archivesBaseName = "gregtech"
minecraft {
@ -50,25 +50,9 @@ repositories {
maven { //JEI
url "http://dvs1.progwml6.com/files/maven/"
}
ivy {
name 'WorldControl'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.worldcontrol.cf}/[module]-[revision].[ext]"
}
ivy {
name 'Railcraft'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.railcraft.cf}/[module]_[revision].[ext]"
}
ivy {
name 'CoFHCore'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofh.cf}/[module]-[revision].[ext]"
}
ivy {
name "EnderCore"
artifactPattern "https://addons-origin.cursecdn.com/files/${config.endercore.cf}/[module]-[revision].[ext]"
}
ivy {
name "EnderIO"
artifactPattern "https://addons-origin.cursecdn.com/files/${config.enderio.cf}/[module]-[revision].[ext]"
maven {
name = "CurseForge"
url = "https://minecraft.curseforge.com/api/maven/"
}
}
@ -76,9 +60,9 @@ dependencies {
compile "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:deobf"
deobfCompile "net.industrial-craft:industrialcraft-2:${config.ic2.version}"
deobfCompile "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}"
deobfCompile "mezz.jei:jei_${config.minecraft.version}:+"
deobfCompile "mezz.jei:jei_${config.minecraft.version}:${config.jei.version}"
compile files('libs/Railcraft_1.10.2-10.2.0-dev.jar')
// deobfCompile name: 'worldcontrol', version: config.worldcontrol.version, ext: 'jar'
deobfCompile name: 'Railcraft', version: "${config.minecraft.version}-${config.railcraft.version}", ext: 'jar'
// deobfCompile name: 'CoFHCore', version: "${config.minecraft.version}-${config.cofh.version}", ext: 'jar'
// deobfCompile name: 'EnderCore', version: "${config.minecraft.version}-${config.endercore.version}", ext: 'jar'
// deobfCompile name: 'EnderIO', version: "${config.minecraft.version}-${config.enderio.version}", ext: 'jar'

10
build.properties
View file

@ -1,18 +1,18 @@
minecraft.version=1.10.2
forge.version=12.18.3.2185
forge.version=12.18.3.2422
gt.version=5.10.90
forestry.version=5.2.7.220
ic2.version=2.6.167-ex110
jei.version=3.7.10.237
forestry.version=5.2.17.388
ic2.version=2.6.254-ex110
jei.version=3.14.7.419
codechickenlib.version=2.4.3.162
worldcontrol.cf=2407/481
worldcontrol.version=1.0.1a
railcraft.cf=2419/257
railcraft.version=10.1.2
railcraft.version=10.2.0
cofh.cf=2434/463
cofh.version=4.1.3.5-universal

BIN
libs/Railcraft_1.10.2-10.2.0-dev.jar Normal file
View file

Binary file not shown.

32
src/main/java/gregtech/GregTechMod.java
View file

@ -8,14 +8,16 @@ import gregtech.api.unification.OreDictUnifier;
import gregtech.api.unification.material.type.Material;
import gregtech.api.util.GTLog;
import gregtech.common.CommonProxy;
import gregtech.common.items.MetaItems;
import gregtech.loaders.load.FuelLoader;
//import gregtech.loaders.postload.BlockResistanceLoader;
//import gregtech.loaders.postload.CraftingRecipeLoader;
//import gregtech.loaders.postload.DungeonLootLoader;
//import gregtech.loaders.postload.MachineRecipeLoader;
//import gregtech.loaders.postload.ScrapboxRecipeLoader;
import gregtech.loaders.preload.GT_Loader_Item_Block_And_Fluid;
import gregtech.loaders.preload.GT_Loader_MetaTileEntities;
import gregtech.loaders.preload.ItemBlockFluidLoader;
import gregtech.loaders.preload.MTELoader;
import gregtech.loaders.preload.OreProcessingLoader;
import ic2.api.recipe.IMachineRecipeManager;
import ic2.api.recipe.RecipeOutput;
import net.minecraft.init.Items;
@ -58,10 +60,10 @@ public class GregTechMod {
@Mod.EventHandler
public void onPreInit(FMLPreInitializationEvent event) {
GTLog.logger.info("PreInit-Phase started!");
GTLog.init(event.getModLog(), event.getModConfigurationDirectory().getParentFile());
GTLog.logger.info("PreInit-Phase started!");
NetworkHandler.init();
EnchantmentEnderDamage.INSTANCE.register();
@ -79,11 +81,10 @@ public class GregTechMod {
gregtechproxy.onPreLoad();
Material.init();
OreDictUnifier.init();
new GT_Loader_Item_Block_And_Fluid().run();
new GT_Loader_MetaTileEntities().run();
new ItemBlockFluidLoader().run();
new MTELoader().run();
// if (gregtechproxy.mSortToTheEnd) {
// try {
@ -112,9 +113,7 @@ public class GregTechMod {
// }
// }
if (RecipeMap.foundInvalidRecipe) {
throw new LoaderException("Found at least one invalid recipe. Please read the log above for more details.");
}
Material.init();
// try {
// for (Runnable tRunnable : GregTechAPI.sAfterGTPreload) {
@ -135,7 +134,18 @@ public class GregTechMod {
// new BeeLoader();
// MetaItems.META_ITEM_FIRST.registerRecipes();
// MetaItems.META_ITEM_SECOND.registerRecipes();
// MetaItems.META_TOOL.registerRecipes();
// new OreProcessingLoader().run();
gregtechproxy.onLoad();
if (RecipeMap.foundInvalidRecipe) {
throw new LoaderException("Found at least one invalid recipe. Please read the log above for more details.");
}
// if (gregtechproxy.mSortToTheEnd) {
// gregtechproxy.registerUnificationEntries();
// new FuelLoader().run();
@ -162,7 +172,7 @@ public class GregTechMod {
// gregtechproxy.registerUnificationEntries();
// } else {
// gregtechproxy.registerUnificationEntries();
new FuelLoader().run();
// new FuelLoader().run();
// }
// new DungeonLootLoader().run();

2
src/main/java/gregtech/api/enchants/EnchantmentRadioactivity.java
View file

@ -18,7 +18,7 @@ public class EnchantmentRadioactivity extends EnchantmentDamage {
}
public void register() {
GameRegistry.register(this, new ResourceLocation(GTValues.MODID, "disjunction"));
GameRegistry.register(this, new ResourceLocation(GTValues.MODID, "radioactivity"));
}
@Override

17
src/main/java/gregtech/api/items/materialitem/MaterialMetaItem.java
View file

@ -40,6 +40,23 @@ public class MaterialMetaItem extends StandardMetaItem {
if(orePrefix != null && canGenerate(orePrefix, material)) {
short metadata = (short) (j * 1000 + i);
generatedItems.add(metadata);
}
}
}
}
}
@Override
public void registerItem(String registryName) {
super.registerItem(registryName);
for(Material material : Material.MATERIAL_REGISTRY.getObjectsWithIds()) {
if(!(material instanceof MarkerMaterial)) {
int i = Material.MATERIAL_REGISTRY.getIDForObject(material);
for(int j = 0; j < orePrefixes.length; j++) {
OrePrefix orePrefix = orePrefixes[j];
if(orePrefix != null && canGenerate(orePrefix, material)) {
short metadata = (short) (j * 1000 + i);
OreDictUnifier.registerOre(new ItemStack(this, 1, metadata), orePrefix, material);
}
}

8
src/main/java/gregtech/api/items/metaitem/FoodStats.java
View file

@ -26,14 +26,16 @@ public class FoodStats implements IFoodStats {
public final RandomPotionEffect[] potionEffects;
@Nullable
public final ItemStack containerItem;
public ItemStack containerItem;
public FoodStats(int foodLevel, float saturation, boolean isDrink, boolean alwaysEdible, ItemStack containerItem, RandomPotionEffect... potionEffects) {
this.foodLevel = foodLevel;
this.saturation = saturation;
this.isDrink = isDrink;
this.alwaysEdible = alwaysEdible;
this.containerItem = containerItem.copy();
if (containerItem != null) {
this.containerItem = containerItem.copy();
}
this.potionEffects = potionEffects;
}
@ -81,7 +83,7 @@ public class FoodStats implements IFoodStats {
for (int i = 0; i < potionEffects.length; i++) {
effects[i] = potionEffects[i].effect;
}
GTUtility.addPotionTooltip(Iterables.cycle(effects), lines);
// GTUtility.addPotionTooltip(Iterables.cycle(effects), lines);
}
}

52
src/main/java/gregtech/api/items/metaitem/MetaItem.java
View file

@ -104,7 +104,11 @@ public abstract class MetaItem<T extends MetaItem<?>.MetaValueItem> extends Item
if(metaValueItem == null) {
return ElectricStats.EMPTY;
}
return metaValueItem.getElectricStats();
IElectricStats electricStats = metaValueItem.getElectricStats();
if (electricStats == null) {
return ElectricStats.EMPTY;
}
return electricStats;
}
@Override
@ -121,7 +125,11 @@ public abstract class MetaItem<T extends MetaItem<?>.MetaValueItem> extends Item
if(metaValueItem == null) {
return FluidStats.EMPTY;
}
return metaValueItem.getFluidStats();
IFluidStats fluidStats = metaValueItem.getFluidStats();
if (fluidStats == null) {
return FluidStats.EMPTY;
}
return fluidStats;
}
@Override
@ -424,29 +432,32 @@ public abstract class MetaItem<T extends MetaItem<?>.MetaValueItem> extends Item
public void addInformation(ItemStack itemStack, EntityPlayer player, List<String> lines, boolean showAdditionalInfo) {
super.addInformation(itemStack, player, lines, showAdditionalInfo);
String unlocalizedTooltip = "metaitem." + getItem(itemStack).unlocalizedName + ".tooltip";
if (I18n.hasKey(unlocalizedTooltip)) {
lines.add(I18n.format(unlocalizedTooltip));
}
T item = getItem(itemStack);
if (item != null) {
String unlocalizedTooltip = "metaitem." + item.unlocalizedName + ".tooltip";
if (I18n.hasKey(unlocalizedTooltip)) {
lines.add(I18n.format(unlocalizedTooltip));
}
IElectricStats electricStats = getManager(itemStack);
if(electricStats.getMaxCharge(itemStack) > 0) {
lines.add(I18n.format("metaitem.generic.electric_item.tooltip",
IElectricStats electricStats = getManager(itemStack);
if (electricStats.getMaxCharge(itemStack) > 0) {
lines.add(I18n.format("metaitem.generic.electric_item.tooltip",
(long) electricStats.getCharge(itemStack),
(long) electricStats.getMaxCharge(itemStack),
GTValues.V[electricStats.getTier(itemStack)]));
}
if(getCapacity(itemStack) > 0) {
FluidStack fluid = getFluid(itemStack);
if(fluid != null) {
lines.add(I18n.format("metaitem.generic.fluid_container.tooltip",
}
if (getCapacity(itemStack) > 0) {
FluidStack fluid = getFluid(itemStack);
if (fluid != null) {
lines.add(I18n.format("metaitem.generic.fluid_container.tooltip",
fluid.amount,
getCapacity(itemStack),
fluid.getLocalizedName()));
} else lines.add(I18n.format("metaitem.generic.fluid_container.tooltip_empty"));
}
for(IItemBehaviour behaviour : getBehaviours(itemStack)) {
behaviour.addInformation(itemStack, lines);
} else lines.add(I18n.format("metaitem.generic.fluid_container.tooltip_empty"));
}
for (IItemBehaviour behaviour : getBehaviours(itemStack)) {
behaviour.addInformation(itemStack, lines);
}
}
}
@ -494,11 +505,16 @@ public abstract class MetaItem<T extends MetaItem<?>.MetaValueItem> extends Item
//Parameters can be either localized or not
protected final String[] nameParameters;
@Nullable
private IElectricStats electricStats;
@Nullable
private IFluidStats fluidStats;
@Nullable
private INuclearStats nuclearStats;
private List<IItemBehaviour> behaviours = new ArrayList<>();
@Nullable
private IItemUseManager useManager;
@Nullable
private IItemDurabilityManager durabilityManager;
private int burnValue = 0;
private boolean visible = true;

5
src/main/java/gregtech/api/items/toolitem/ToolMetaItem.java
View file

@ -145,6 +145,9 @@ public class ToolMetaItem<T extends ToolMetaItem<?>.MetaToolValueItem> extends M
T metaValueItem = getItem(stack);
if(metaValueItem != null && slot == EntityEquipmentSlot.MAINHAND) {
IToolStats toolStats = metaValueItem.getToolStats();
if (toolStats == null) {
return HashMultimap.create();
}
float attackDamage = toolStats.getBaseDamage(stack);
float attackSpeed = toolStats.getAttackSpeed(stack);
@ -315,7 +318,7 @@ public class ToolMetaItem<T extends ToolMetaItem<?>.MetaToolValueItem> extends M
}
public final ItemStack getStackForm(Material primaryMaterial, Material handleMaterial, int amount) {
ItemStack stack = getStackForm(amount);
ItemStack stack = new ItemStack(ToolMetaItem.this, amount, metaItemOffset + metaValue);
T metaToolValueItem = getItem(stack);
if (metaToolValueItem != null) {

2
src/main/java/gregtech/api/metatileentity/IMetaTileEntity.java
View file

@ -113,7 +113,7 @@ public interface IMetaTileEntity extends ITurnable, IRedstoneReceiver, IRedstone
* @param player player who opens GUI
* @return instance of ModularUI for this MetaTileEntity
*/
ModularUI<? extends IGregTechTileEntity> createUI(EntityPlayer player);
ModularUI<? extends IMetaTileEntity> createUI(EntityPlayer player);
int[] getSlotsForFace(EnumFacing face);
//side == null - internal inventory change

45
src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
View file

@ -330,29 +330,11 @@ public abstract class MetaTileEntity implements IMetaTileEntity {
holder.markDirty();
}
@Override
public boolean onRightClick(EntityPlayer player, EnumFacing side, float clickX, float clickY, float clickZ) {
return false;
}
@Override
public void onLeftClick(EntityPlayer player) {
}
@Override
public void onScrewdriverRightClick(EnumFacing side, EntityPlayer player, float clickX, float clickY, float clickZ) {
}
@Override
public boolean onWrenchRightClick(EnumFacing side, EnumFacing wrenchingSide, EntityPlayer player, float clickX, float clickY, float clickZ) {
if(isValidFacing(wrenchingSide)) {
setFrontFacing(wrenchingSide);
return true;
}
return false;
}
@Override
public void onFirstTick() {
}
@ -373,31 +355,11 @@ public abstract class MetaTileEntity implements IMetaTileEntity {
public void onRemoval() {
}
@Override
public Container getServerGUI(int ID, InventoryPlayer playerInventory) {
return null;
}
@Override
public GuiContainer getClientGUI(int ID, InventoryPlayer playerInventory) {
return null;
}
@Override
public boolean isAccessAllowed(EntityPlayer player) {
return true; //default - to be overridden
}
@Override
public int getComparatorValue(EnumFacing side) {
return 0;
}
@Override
public float getExplosionResistance(EnumFacing side) {
return 2.0f;
}
@Override
public void onEntityCollidedWithBlock(Entity collider) {
}
@ -467,17 +429,12 @@ public abstract class MetaTileEntity implements IMetaTileEntity {
}
}
@Override
public void onExplosion() {
// NO OP
}
@Override
public void doExplosion(long strength) {
BlockPos pos = holder.getWorldPos();
World world = holder.getWorldObj();
GTUtility.playSound(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, GregTechAPI.soundList.get(209), SoundCategory.BLOCKS, 1.0f, 1.0f);
// if (GregTechAPI.sMachineExplosions) {
// if (GregTechAPI.sMachineExplosions) { // TODO CONFIG
world.createExplosion(null, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, strength, true);
// }
}

5
src/main/java/gregtech/api/recipes/ModHandler.java
View file

@ -46,6 +46,7 @@ import net.minecraftforge.fml.common.event.FMLInterModComms;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import org.apache.commons.lang3.Validate;
import javax.annotation.Nullable;
@ -378,7 +379,7 @@ public class ModHandler {
*/
public static void addShapelessRecipe(ItemStack result, Object... recipe) {
result = OreDictUnifier.getUnificated(result);
Validate.notNull(result, "Result cannot be null");
if (result == null) return;
Validate.notNull(recipe, "Recipe cannot be null");
Validate.isTrue(recipe.length > 0, "Recipe cannot be empty");
Validate.noNullElements(recipe, "Recipe cannot contain null elements");
@ -399,7 +400,7 @@ public class ModHandler {
}
}
GameRegistry.addRecipe(new ShapedOreRecipe(result.copy(), recipe));
GameRegistry.addRecipe(new ShapelessOreRecipe(result.copy(), recipe));
}
///////////////////////////////////////////////////

47
src/main/java/gregtech/api/recipes/RecipeBuilder.java
View file

@ -128,7 +128,7 @@ public abstract class RecipeBuilder<T extends Recipe, R extends RecipeBuilder<T,
public R outputs(Collection<ItemStack> outputs) {
outputs = new ArrayList<>(outputs);
if(outputs.contains(null)) outputs.remove(null);
if(outputs.contains(null)) outputs.removeIf(Objects::isNull);
this.outputs.addAll(outputs);
return getThis();
}
@ -153,7 +153,7 @@ public abstract class RecipeBuilder<T extends Recipe, R extends RecipeBuilder<T,
public R fluidOutputs(Collection<FluidStack> outputs) {
outputs = new ArrayList<>(outputs);
if(outputs.contains(null)) outputs.remove(null);
if(outputs.contains(null)) outputs.removeIf(Objects::isNull);
this.fluidOutputs.addAll(outputs);
return getThis();
}
@ -239,12 +239,17 @@ public abstract class RecipeBuilder<T extends Recipe, R extends RecipeBuilder<T,
inputs.replaceAll(OreDictUnifier::getUnificated);
outputs.replaceAll(OreDictUnifier::getUnificated);
TObjectIntMap<ItemStack> newMap = new TObjectIntHashMap<>();
TObjectIntIterator<ItemStack> iterator = chancedOutputs.iterator();
while (iterator.hasNext()) {
newMap.put(OreDictUnifier.getUnificated(iterator.key()), iterator.value());
}
chancedOutputs = newMap;
ItemStack[] keys = chancedOutputs.keys(new ItemStack[0]);
int[] values = chancedOutputs.values();
for (int i = 0; i < keys.length; i++) {
keys[i] = OreDictUnifier.getUnificated(keys[i]);
}
chancedOutputs = new TObjectIntHashMap<>();
for (int i = 0; i < keys.length; i++) {
chancedOutputs.put(keys[i], values[i]);
}
}
for (ItemStack stack : inputs) {
@ -297,21 +302,25 @@ public abstract class RecipeBuilder<T extends Recipe, R extends RecipeBuilder<T,
recipeStatus = EnumValidationResult.INVALID;
}
if (!GTUtility.isBetweenExclusive(recipeMap.getMinInputs(), recipeMap.getMaxInputs(), inputs.size())){
GTLog.logger.error("Invalid amount of recipe inputs", new IllegalArgumentException());
if (!GTUtility.isBetweenInclusive(recipeMap.getMinInputs(), recipeMap.getMaxInputs(), inputs.size())){
GTLog.logger.error("Invalid amount of recipe inputs. Actual: {}, Should be between {} and {} inclusive", inputs.size(), recipeMap.getMinInputs(), recipeMap.getMaxInputs());
GTLog.logger.error("Stacktrace:", new IllegalArgumentException());
recipeStatus = EnumValidationResult.INVALID;
}
if (!GTUtility.isBetweenExclusive(recipeMap.getMinOutputs(), recipeMap.getMaxOutputs(), outputs.size() + chancedOutputs.size())){
GTLog.logger.error("Invalid amount of recipe outputs", new IllegalArgumentException());
recipeStatus = EnumValidationResult.INVALID;
if (!GTUtility.isBetweenInclusive(recipeMap.getMinOutputs(), recipeMap.getMaxOutputs(), outputs.size() + chancedOutputs.size())){
GTLog.logger.error("Invalid amount of recipe outputs. Actual: {}, Should be between {} and {} inclusive", outputs.size() + chancedOutputs.size(), recipeMap.getMinOutputs(), recipeMap.getMaxOutputs());
GTLog.logger.error("Stacktrace:", new IllegalArgumentException());
recipeStatus = EnumValidationResult.INVALID;
}
if (!GTUtility.isBetweenExclusive(recipeMap.getMinFluidInputs(), recipeMap.getMaxFluidInputs(), fluidInputs.size())){
GTLog.logger.error("Invalid amount of recipe fluid inputs", new IllegalArgumentException());
recipeStatus = EnumValidationResult.INVALID;
if (!GTUtility.isBetweenInclusive(recipeMap.getMinFluidInputs(), recipeMap.getMaxFluidInputs(), fluidInputs.size())){
GTLog.logger.error("Invalid amount of recipe fluid inputs. Actual: {}, Should be between {} and {} inclusive", fluidInputs.size(), recipeMap.getMinFluidInputs(), recipeMap.getMaxFluidInputs());
GTLog.logger.error("Stacktrace:", new IllegalArgumentException());
recipeStatus = EnumValidationResult.INVALID;
}
if (!GTUtility.isBetweenExclusive(recipeMap.getMinFluidOutputs(), recipeMap.getMaxFluidOutputs(), fluidOutputs.size())){
GTLog.logger.error("Invalid amount of recipe fluid outputs", new IllegalArgumentException());
recipeStatus = EnumValidationResult.INVALID;
if (!GTUtility.isBetweenInclusive(recipeMap.getMinFluidOutputs(), recipeMap.getMaxFluidOutputs(), fluidOutputs.size())){
GTLog.logger.error("Invalid amount of recipe fluid outputs. Actual: {}, Should be between {} and {} inclusive", fluidOutputs.size(), recipeMap.getMinFluidOutputs(), recipeMap.getMaxFluidOutputs());
GTLog.logger.error("Stacktrace:", new IllegalArgumentException());
recipeStatus = EnumValidationResult.INVALID;
}
// Validate.isTrue(EUt > 0, "EU/t cannot be less of equal to 0");

4
src/main/java/gregtech/api/unification/OreDictUnifier.java
View file

@ -36,18 +36,22 @@ public class OreDictUnifier {
private static final HashMap<UnificationEntry, ArrayList<SimpleItemStack>> stackUnificationItems = new HashMap<>();
public static void registerOre(ItemStack itemStack, MaterialStack component, MaterialStack... byproducts) {
if (itemStack == null) return;
materialUnificationInfo.put(new SimpleItemStack(itemStack), new ItemMaterialInfo(component, byproducts));
}
public static void registerOre(ItemStack itemStack, ItemMaterialInfo materialInfo) {
if (itemStack == null) return;
materialUnificationInfo.put(new SimpleItemStack(itemStack), materialInfo);
}
public static void registerOre(ItemStack itemStack, OrePrefix orePrefix, @Nullable Material material) {
if (itemStack == null) return;
OreDictionary.registerOre(orePrefix.name() + (material == null ? "" : material.toCamelCaseString()), itemStack);
}
public static void registerOre(ItemStack itemStack, String oreDict) {
if (itemStack == null) return;
OreDictionary.registerOre(oreDict, itemStack);
}

11
src/main/java/gregtech/api/unification/stack/UnificationEntry.java
View file

@ -3,12 +3,15 @@ package gregtech.api.unification.stack;
import gregtech.api.unification.ore.OrePrefix;
import gregtech.api.unification.material.type.Material;
import javax.annotation.Nullable;
public class UnificationEntry {
public final OrePrefix orePrefix;
@Nullable
public final Material material;
public UnificationEntry(OrePrefix orePrefix, Material material) {
public UnificationEntry(OrePrefix orePrefix, @Nullable Material material) {
this.orePrefix = orePrefix;
this.material = material;
}
@ -21,19 +24,19 @@ public class UnificationEntry {
UnificationEntry that = (UnificationEntry) o;
if (orePrefix != that.orePrefix) return false;
return material.equals(that.material);
return material != null ? material.equals(that.material) : that.material == null;
}
@Override
public int hashCode() {
int result = orePrefix.hashCode();
result = 31 * result + material.hashCode();
result = 31 * result + (material != null ? material.hashCode() : 0);
return result;
}
@Override
public String toString() {
return orePrefix.name() + material.toCamelCaseString();
return orePrefix.name() + (material != null ? material.toCamelCaseString() : "");
}
}

6
src/main/java/gregtech/common/blocks/BlockMachine.java
View file

@ -12,6 +12,7 @@ import net.minecraft.block.material.EnumPushReaction;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@ -123,6 +124,11 @@ public class BlockMachine extends Block implements ITileEntityProvider {
return false;
}
@Override
protected BlockStateContainer createBlockState() {
return new BlockStateContainer(this, HARVEST_LEVEL, HARVEST_TOOL);
}
@Override
public IBlockState getStateFromMeta(int meta) {
return getDefaultState()

2923
src/main/java/gregtech/common/items/MetaItem1.java
View file

File diff suppressed because it is too large Load diff

375
src/main/java/gregtech/common/items/MetaItem2.java
View file

@ -32,6 +32,11 @@ public class MetaItem2 extends MaterialMetaItem {
OrePrefix.wireFine, OrePrefix.gearSmall, OrePrefix.rotor, OrePrefix.stickLong, OrePrefix.springSmall, OrePrefix.spring,
OrePrefix.gemChipped, OrePrefix.gemFlawed, OrePrefix.gemFlawless, OrePrefix.gemExquisite, OrePrefix.gear,
null, null, null, null, null);
}
@Override
public void registerItem(String registryName) {
super.registerItem(registryName);
boolean drinksAlwaysDrinkable = false;
@ -146,37 +151,6 @@ public class MetaItem2 extends MaterialMetaItem {
SFMIXTURE = addItem(270, "sfmixture");
MSFMIXTURE = addItem(271, "msfmixture");
ModHandler.addShapedRecipe(PLANK_OAK.getStackForm(2),
"s ",
" P",
'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 0));
ModHandler.addShapedRecipe(PLANK_SPRUCE.getStackForm(2),
"s ",
" P",
'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 1));
ModHandler.addShapedRecipe(PLANK_BIRCH.getStackForm(2),
"s ",
" P",
'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 2));
ModHandler.addShapedRecipe(PLANK_JUNGLE.getStackForm(2),
"s ",
" P",
'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 3));
ModHandler.addShapedRecipe(PLANK_ACACIA.getStackForm(2),
"s ",
" P",
'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 4));
ModHandler.addShapedRecipe(PLANK_DARKOAK.getStackForm(2),
"s ",
" P",
'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 5));
CROP_DROP_PLUMBILIA = addItem(500, "crop.drop.plumbilia");
CROP_DROP_ARGENTIA = addItem(501, "crop.drop.argentia");
CROP_DROP_INDIGO = addItem(502, "crop.drop.indigo");
@ -234,228 +208,265 @@ public class MetaItem2 extends MaterialMetaItem {
FOOD_SLICED_CUCUMBER = addItem(574, "food.sliced.cucumber").addStats(new FoodStats(1, 0.05F));
FOOD_SLICED_CHEESE = addItem(576, "food.sliced.cheese").addStats(new FoodStats(1, 0.1F));
}
public void registerRecipes() {
// Plank recipes
ModHandler.addShapedRecipe(PLANK_OAK.getStackForm(2),
"s ",
" P",
'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 0));
ModHandler.addShapedRecipe(PLANK_SPRUCE.getStackForm(2),
"s ",
" P",
'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 1));
ModHandler.addShapedRecipe(PLANK_BIRCH.getStackForm(2),
"s ",
" P",
'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 2));
ModHandler.addShapedRecipe(PLANK_JUNGLE.getStackForm(2),
"s ",
" P",
'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 3));
ModHandler.addShapedRecipe(PLANK_ACACIA.getStackForm(2),
"s ",
" P",
'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 4));
ModHandler.addShapedRecipe(PLANK_DARKOAK.getStackForm(2),
"s ",
" P",
'P', new ItemStack(Blocks.WOODEN_SLAB, 1, 5));
// Dyes recipes
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 0))
.outputs(new ItemStack(Items.DYE, 2, 1))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 0))
.outputs(new ItemStack(Items.DYE, 2, 1))
.buildAndRegister();
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 1))
.outputs(new ItemStack(Items.DYE, 2, 12))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 1))
.outputs(new ItemStack(Items.DYE, 2, 12))
.buildAndRegister();
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 2))
.outputs(new ItemStack(Items.DYE, 2, 13))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 2))
.outputs(new ItemStack(Items.DYE, 2, 13))
.buildAndRegister();
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 3))
.outputs(new ItemStack(Items.DYE, 2, 7))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 3))
.outputs(new ItemStack(Items.DYE, 2, 7))
.buildAndRegister();
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 4))
.outputs(new ItemStack(Items.DYE, 2, 1))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 4))
.outputs(new ItemStack(Items.DYE, 2, 1))
.buildAndRegister();
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 5))
.outputs(new ItemStack(Items.DYE, 2, 14))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 5))
.outputs(new ItemStack(Items.DYE, 2, 14))
.buildAndRegister();
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 6))
.outputs(new ItemStack(Items.DYE, 2, 7))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 6))
.outputs(new ItemStack(Items.DYE, 2, 7))
.buildAndRegister();
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 7))
.outputs(new ItemStack(Items.DYE, 2, 9))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 7))
.outputs(new ItemStack(Items.DYE, 2, 9))
.buildAndRegister();
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 8))
.outputs(new ItemStack(Items.DYE, 2, 7))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.RED_FLOWER, 1, 8))
.outputs(new ItemStack(Items.DYE, 2, 7))
.buildAndRegister();
.inputs(new ItemStack(Blocks.YELLOW_FLOWER, 1, 0))
.outputs(new ItemStack(Items.DYE, 2, 11))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.YELLOW_FLOWER, 1, 0))
.outputs(new ItemStack(Items.DYE, 2, 11))
.buildAndRegister();
.inputs(new ItemStack(Blocks.DOUBLE_PLANT, 1, 0))
.outputs(new ItemStack(Items.DYE, 3, 11))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.DOUBLE_PLANT, 1, 0))
.outputs(new ItemStack(Items.DYE, 3, 11))
.buildAndRegister();
.inputs(new ItemStack(Blocks.DOUBLE_PLANT, 1, 1))
.outputs(new ItemStack(Items.DYE, 3, 13))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.DOUBLE_PLANT, 1, 1))
.outputs(new ItemStack(Items.DYE, 3, 13))
.buildAndRegister();
.inputs(new ItemStack(Blocks.DOUBLE_PLANT, 1, 4))
.outputs(new ItemStack(Items.DYE, 3, 1))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.DOUBLE_PLANT, 1, 4))
.outputs(new ItemStack(Items.DYE, 3, 1))
.buildAndRegister();
.inputs(new ItemStack(Blocks.DOUBLE_PLANT, 1, 5))
.outputs(new ItemStack(Items.DYE, 3, 9))
.buildAndRegister();
// Crops recipes
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(CROP_DROP_PLUMBILIA.getStackForm())
.outputs(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Lead, 1))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.DOUBLE_PLANT, 1, 5))
.outputs(new ItemStack(Items.DYE, 3, 9))
.buildAndRegister();
.inputs(CROP_DROP_ARGENTIA.getStackForm())
.outputs(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Silver, 1))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(CROP_DROP_PLUMBILIA.getStackForm())
.outputs(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Lead, 1))
.buildAndRegister();
.inputs(CROP_DROP_INDIGO.getStackForm())
.outputs(DYE_INDIGO.getStackForm())
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(CROP_DROP_ARGENTIA.getStackForm())
.outputs(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Silver, 1))
.buildAndRegister();
.inputs(CROP_DROP_MILK_WART.getStackForm())
.outputs(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Milk))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(CROP_DROP_INDIGO.getStackForm())
.outputs(DYE_INDIGO.getStackForm())
.buildAndRegister();
.inputs(CROP_DROP_COPPON.getStackForm())
.outputs(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Copper))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(CROP_DROP_MILK_WART.getStackForm())
.outputs(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Milk, 1))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(CROP_DROP_COPPON.getStackForm())
.outputs(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Copper, 1))
.buildAndRegister();
RecipeMap.EXTRACTOR_RECIPES.recipeBuilder()
.inputs(CROP_DROP_TINE.getStackForm())
.outputs(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Tin, 1))
.buildAndRegister();
.inputs(CROP_DROP_TINE.getStackForm())
.outputs(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Tin))
.buildAndRegister();
ItemStack plantBall = ModHandler.IC2.getIC2Item(ItemName.crafting, CraftingItemType.plant_ball, 1);
RecipeMap.COMPRESSOR_RECIPES.recipeBuilder()
.inputs(CROP_DROP_COPPON.getStackForm(4))
.outputs(new ItemStack(Blocks.WOOL, 1, 1))
.buildAndRegister();
.inputs(CROP_DROP_COPPON.getStackForm(4))
.outputs(new ItemStack(Blocks.WOOL, 1, 1))
.buildAndRegister();
RecipeMap.COMPRESSOR_RECIPES.recipeBuilder()
.inputs(CROP_DROP_PLUMBILIA.getStackForm(8))
.outputs(plantBall.copy())
.buildAndRegister();
.inputs(CROP_DROP_PLUMBILIA.getStackForm(8))
.outputs(plantBall.copy())
.buildAndRegister();
RecipeMap.COMPRESSOR_RECIPES.recipeBuilder()
.inputs(CROP_DROP_ARGENTIA.getStackForm(8))
.outputs(plantBall.copy())
.buildAndRegister();
.inputs(CROP_DROP_ARGENTIA.getStackForm(8))
.outputs(plantBall.copy())
.buildAndRegister();
RecipeMap.COMPRESSOR_RECIPES.recipeBuilder()
.inputs(CROP_DROP_INDIGO.getStackForm(8))
.outputs(plantBall.copy())
.buildAndRegister();
.inputs(CROP_DROP_INDIGO.getStackForm(8))
.outputs(plantBall.copy())
.buildAndRegister();
RecipeMap.COMPRESSOR_RECIPES.recipeBuilder()
.inputs(CROP_DROP_FERRU.getStackForm(8))
.outputs(plantBall.copy())
.buildAndRegister();
.inputs(CROP_DROP_FERRU.getStackForm(8))
.outputs(plantBall.copy())
.buildAndRegister();
RecipeMap.COMPRESSOR_RECIPES.recipeBuilder()
.inputs(CROP_DROP_AURELIA.getStackForm(8))
.outputs(plantBall.copy())
.buildAndRegister();
.inputs(CROP_DROP_AURELIA.getStackForm(8))
.outputs(plantBall.copy())
.buildAndRegister();
RecipeMap.COMPRESSOR_RECIPES.recipeBuilder()
.inputs(CROP_DROP_OIL_BERRY.getStackForm(8))
.outputs(plantBall.copy())
.buildAndRegister();
.inputs(CROP_DROP_OIL_BERRY.getStackForm(8))
.outputs(plantBall.copy())
.buildAndRegister();
RecipeMap.COMPRESSOR_RECIPES.recipeBuilder()
.inputs(CROP_DROP_BOBS_YER_UNCLE_RANKS.getStackForm(8))
.outputs(plantBall.copy())
.buildAndRegister();
.inputs(CROP_DROP_BOBS_YER_UNCLE_RANKS.getStackForm(8))
.outputs(plantBall.copy())
.buildAndRegister();
RecipeMap.COMPRESSOR_RECIPES.recipeBuilder()
.inputs(CROP_DROP_TINE.getStackForm(4))
.outputs(plantBall.copy())
.buildAndRegister();
.inputs(CROP_DROP_TINE.getStackForm(4))
.outputs(plantBall.copy())
.buildAndRegister();
RecipeMap.COMPRESSOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.RED_FLOWER, 8, W))
.outputs(plantBall.copy())
.buildAndRegister();
.inputs(new ItemStack(Blocks.RED_FLOWER, 8, W))
.outputs(plantBall.copy())
.buildAndRegister();
RecipeMap.COMPRESSOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.RED_FLOWER, 8, W))
.outputs(plantBall.copy())
.buildAndRegister();
.inputs(new ItemStack(Blocks.RED_FLOWER, 8, W))
.outputs(plantBall.copy())
.buildAndRegister();
// Misc
RecipeMap.MACERATOR_RECIPES.recipeBuilder()
.inputs(FOOD_SLICED_CHEESE.getStackForm())
.outputs(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Cheese, 1))
.duration(400)
.EUt(2)
.buildAndRegister();
RecipeMap.MACERATOR_RECIPES.recipeBuilder()
.inputs(FOOD_SLICED_CHEESE.getStackForm())
.outputs(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Cheese, 1))
.duration(400)
.EUt(2)
.buildAndRegister();
.inputs(new ItemStack(Items.DYE, 1, EnumDyeColor.BROWN.getDyeDamage()))
.outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Cocoa, 1))
.duration(400)
.EUt(2)
.buildAndRegister();
RecipeMap.MACERATOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Items.DYE, 1, EnumDyeColor.BROWN.getDyeDamage()))
.outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Cocoa, 1))
.duration(400)
.EUt(2)
.buildAndRegister();
.inputs(CROP_DROP_TINE.getStackForm())
.outputs(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Wood, 2))
.duration(400)
.EUt(2)
.buildAndRegister();
RecipeMap.MACERATOR_RECIPES.recipeBuilder()
.inputs(CROP_DROP_TINE.getStackForm())
.outputs(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Wood, 2))
.duration(400)
.EUt(2)
.buildAndRegister();
.inputs(new ItemStack(Items.REEDS, 1))
.outputs(new ItemStack(Items.SUGAR, 1))
.duration(400)
.EUt(2)
.buildAndRegister();
RecipeMap.MACERATOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Items.REEDS, 1))
.outputs(new ItemStack(Items.SUGAR, 1))
.duration(400)
.EUt(2)
.buildAndRegister();
.inputs(new ItemStack(Blocks.MELON_BLOCK, 1, 0))
.outputs(new ItemStack(Items.MELON, 8, 0))
.chancedOutput(new ItemStack(Items.MELON_SEEDS, 1), 8000)
.duration(400)
.EUt(2)
.buildAndRegister();
RecipeMap.MACERATOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.MELON_BLOCK, 1, 0))
.outputs(new ItemStack(Items.MELON, 8, 0))
.chancedOutput(new ItemStack(Items.MELON_SEEDS, 1), 8000)
.duration(400)
.EUt(2)
.buildAndRegister();
.inputs(new ItemStack(Blocks.PUMPKIN, 1, 0))
.outputs(new ItemStack(Items.PUMPKIN_SEEDS, 4, 0))
.duration(400)
.EUt(2)
.buildAndRegister();
RecipeMap.MACERATOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.PUMPKIN, 1, 0))
.outputs(new ItemStack(Items.PUMPKIN_SEEDS, 4, 0))
.duration(400)
.EUt(2)
.buildAndRegister();
.inputs(new ItemStack(Items.MELON, 1, 0))
.outputs(new ItemStack(Items.MELON_SEEDS, 1, 0))
.duration(400)
.EUt(2)
.buildAndRegister();
RecipeMap.MACERATOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Items.MELON, 1, 0))
.outputs(new ItemStack(Items.MELON_SEEDS, 1, 0))
.duration(400)
.EUt(2)
.buildAndRegister();
.inputs(new ItemStack(Items.WHEAT, 1, 0))
.outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Wheat, 1))
.duration(400)
.EUt(2)
.buildAndRegister();
RecipeMap.MACERATOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Items.WHEAT, 1, 0))
.outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Wheat, 1))
.duration(400)
.EUt(2)
.buildAndRegister();
.inputs(new ItemStack(Items.STICK, 1))
.outputs(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Wood, 2))
.duration(400)
.EUt(2)
.buildAndRegister();
RecipeMap.MACERATOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Items.STICK, 1))
.outputs(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Wood, 2))
.duration(400)
.EUt(2)
.buildAndRegister();
RecipeMap.MACERATOR_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.WOOL, 1, W))
.outputs(new ItemStack(Items.STRING, 2))
.chancedOutput(new ItemStack(Items.STRING, 1), 5000)
.duration(400)
.EUt(2)
.buildAndRegister();
.inputs(new ItemStack(Blocks.WOOL, 1, W))
.outputs(new ItemStack(Items.STRING, 2))
.chancedOutput(new ItemStack(Items.STRING, 1), 5000)
.duration(400)
.EUt(2)
.buildAndRegister();
}
@Override

476
src/main/java/gregtech/common/items/MetaTool.java
View file

@ -6,6 +6,7 @@ import gregtech.api.recipes.ModHandler;
import gregtech.api.unification.OreDictUnifier;
import gregtech.api.unification.material.Materials;
import gregtech.api.unification.ore.OrePrefix;
import gregtech.api.unification.stack.UnificationEntry;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
@ -16,6 +17,11 @@ public class MetaTool extends ToolMetaItem<ToolMetaItem<?>.MetaToolValueItem> {
public MetaTool() {
super();
}
@Override
public void registerItem(String registryName) {
super.registerItem(registryName);
SWORD = addItem(0, "tool.sword")/*.setToolStats(new ToolSword())*/.addOreDict(ToolDictNames.craftingToolSword);
PICKAXE = addItem(1, "tool.pickaxe")/*.setToolStats(new ToolPickaxe())*/.addOreDict(ToolDictNames.craftingToolPickaxe);
@ -60,300 +66,302 @@ public class MetaTool extends ToolMetaItem<ToolMetaItem<?>.MetaToolValueItem> {
TURBINE_NORMAL = addItem(37, "tool.turbine.normal")/*.setToolStats(new ToolTurbineNormal())*/;
TURBINE_LARGE = addItem(38, "tool.turbine.large")/*.setToolStats(new ToolTurbineLarge())*/;
TURBINE_HUGE = addItem(39, "tool.turbine.huge")/*.setToolStats(new ToolTurbineHuge())*/;
}
public void registerRecipes() {
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Flint, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', new ItemStack(Items.FLINT, 1),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Bronze, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', new UnificationEntry(OrePrefix.ingot, Materials.Bronze),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Iron, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', new UnificationEntry(OrePrefix.ingot, Materials.Iron),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Steel, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', new UnificationEntry(OrePrefix.ingot, Materials.Steel),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.WroughtIron, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', new UnificationEntry(OrePrefix.ingot, Materials.WroughtIron),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.RedSteel, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', new UnificationEntry(OrePrefix.ingot, Materials.RedSteel),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.BlueSteel, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', new UnificationEntry(OrePrefix.ingot, Materials.BlueSteel),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.BlackSteel, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', new UnificationEntry(OrePrefix.ingot, Materials.BlackSteel),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.DamascusSteel, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', new UnificationEntry(OrePrefix.ingot, Materials.DamascusSteel),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Wood, Materials.Wood),
" S",
" I ",
"S f",
'I', new UnificationEntry(OrePrefix.ingot, Materials.Wood),
'S', new UnificationEntry(OrePrefix.stick, Materials.Wood));
ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Plastic, Materials.Plastic),
" S",
" I ",
"S f",
'I', new UnificationEntry(OrePrefix.ingot, Materials.Plastic),
'S', new UnificationEntry(OrePrefix.stick, Materials.Plastic));
ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Aluminium, Materials.Aluminium),
" S",
" I ",
"S f",
'I', new UnificationEntry(OrePrefix.ingot, Materials.Aluminium),
'S', new UnificationEntry(OrePrefix.stick, Materials.Aluminium));
ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.StainlessSteel, Materials.StainlessSteel),
" S",
" I ",
"S f",
'I', new UnificationEntry(OrePrefix.ingot, Materials.StainlessSteel),
'S', new UnificationEntry(OrePrefix.stick, Materials.StainlessSteel));
if (false) { //TODO CONFIG !GregTechAPI.sSpecialFile.get(ConfigCategories.general, "DisableFlintTools", false)
ModHandler.addShapedRecipe(SWORD.getStackForm(Materials.Flint, Materials.Wood),
"F",
"F",
"S",
'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
ModHandler.addShapedRecipe(PICKAXE.getStackForm(Materials.Flint, Materials.Wood),
"FFF",
" S ",
" S ",
'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
ModHandler.addShapedRecipe(SHOVEL.getStackForm(Materials.Flint, Materials.Wood),
"F",
"S",
"S",
'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
ModHandler.addShapedRecipe(AXE.getStackForm(Materials.Flint, Materials.Wood),// true,
"FF",
"FS",
" S",
'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
ModHandler.addShapedRecipe(HOE.getStackForm(Materials.Flint, Materials.Wood),// true,
"FF",
" S",
" S",
'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
ModHandler.addShapedRecipe(KNIFE.getStackForm(Materials.Flint, Materials.Wood),
"F",
"S",
'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Flint, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', new ItemStack(Items.FLINT, 1),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Bronze, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Bronze),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Iron, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Iron),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Steel, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Steel),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.WroughtIron, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.WroughtIron),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.RedSteel, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.RedSteel),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.BlueSteel, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.BlueSteel),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.BlackSteel, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.BlackSteel),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.DamascusSteel, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.DamascusSteel),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Wood, Materials.Wood),
" S",
" I ",
"S f",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Wood),
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood));
ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Plastic, Materials.Plastic),
" S",
" I ",
"S f",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Plastic),
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Plastic));
ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Aluminium, Materials.Aluminium),
" S",
" I ",
"S f",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Aluminium),
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Aluminium));
ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.StainlessSteel, Materials.StainlessSteel),
" S",
" I ",
"S f",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.StainlessSteel),
'S', OreDictUnifier.get(OrePrefix.stick, Materials.StainlessSteel));
if (false) { //TODO CONFIG !GregTechAPI.sSpecialFile.get(ConfigCategories.general, "DisableFlintTools", false)
ModHandler.addShapedRecipe(SWORD.getStackForm(Materials.Flint, Materials.Wood),
"F",
"F",
"S",
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
ModHandler.addShapedRecipe(PICKAXE.getStackForm(Materials.Flint, Materials.Wood),
"FFF",
" S ",
" S ",
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
ModHandler.addShapedRecipe(SHOVEL.getStackForm(Materials.Flint, Materials.Wood),
"F",
"S",
"S",
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
ModHandler.addShapedRecipe(AXE.getStackForm(Materials.Flint, Materials.Wood),// true,
"FF",
"FS",
" S",
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
ModHandler.addShapedRecipe(HOE.getStackForm(Materials.Flint, Materials.Wood),// true,
"FF",
" S",
" S",
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
ModHandler.addShapedRecipe(KNIFE.getStackForm(Materials.Flint, Materials.Wood),
"F",
"S",
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Flint, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', new ItemStack(Items.FLINT, 1),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Bronze, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Bronze),
'S', OrePrefix.stone);
" I ",
"SIS",
"SSS",
'I', new UnificationEntry(OrePrefix.ingot, Materials.Bronze),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Iron, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Iron),
'S', OrePrefix.stone);
" I ",
"SIS",
"SSS",
'I', new UnificationEntry(OrePrefix.ingot, Materials.Iron),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.Steel, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Steel),
'S', OrePrefix.stone);
" I ",
"SIS",
"SSS",
'I', new UnificationEntry(OrePrefix.ingot, Materials.Steel),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.WroughtIron, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.WroughtIron),
'S', OrePrefix.stone);
" I ",
"SIS",
"SSS",
'I', new UnificationEntry(OrePrefix.ingot, Materials.WroughtIron),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.RedSteel, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.RedSteel),
'S', OrePrefix.stone);
" I ",
"SIS",
"SSS",
'I', new UnificationEntry(OrePrefix.ingot, Materials.RedSteel),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.BlueSteel, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.BlueSteel),
'S', OrePrefix.stone);
" I ",
"SIS",
"SSS",
'I', new UnificationEntry(OrePrefix.ingot, Materials.BlueSteel),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.BlackSteel, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.BlackSteel),
'S', OrePrefix.stone);
" I ",
"SIS",
"SSS",
'I', new UnificationEntry(OrePrefix.ingot, Materials.BlackSteel),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(MORTAR.getStackForm(Materials.DamascusSteel, Materials.Stone),
" I ",
"SIS",
"SSS",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.DamascusSteel),
'S', OrePrefix.stone);
" I ",
"SIS",
"SSS",
'I', new UnificationEntry(OrePrefix.ingot, Materials.DamascusSteel),
'S', OrePrefix.stone);
ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Wood, Materials.Wood),
" S",
" I ",
"S f",
'I', OreDictUnifier.get(OrePrefix.plank, Materials.Wood),
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood));
" S",
" I ",
"S f",
'I', new UnificationEntry(OrePrefix.plank, Materials.Wood),
'S', new UnificationEntry(OrePrefix.stick, Materials.Wood));
ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Plastic, Materials.Plastic),
" S",
" I ",
"S f",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Plastic),
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Plastic));
" S",
" I ",
"S f",
'I', new UnificationEntry(OrePrefix.ingot, Materials.Plastic),
'S', new UnificationEntry(OrePrefix.stick, Materials.Plastic));
ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.Aluminium, Materials.Aluminium),
" S",
" I ",
"S f",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Aluminium),
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Aluminium));
" S",
" I ",
"S f",
'I', new UnificationEntry(OrePrefix.ingot, Materials.Aluminium),
'S', new UnificationEntry(OrePrefix.stick, Materials.Aluminium));
ModHandler.addShapedRecipe(ROLLING_PIN.getStackForm(Materials.StainlessSteel, Materials.StainlessSteel),
" S",
" I ",
"S f",
'I', OreDictUnifier.get(OrePrefix.ingot, Materials.StainlessSteel),
'S', OreDictUnifier.get(OrePrefix.stick, Materials.StainlessSteel));
" S",
" I ",
"S f",
'I', new UnificationEntry(OrePrefix.ingot, Materials.StainlessSteel),
'S', new UnificationEntry(OrePrefix.stick, Materials.StainlessSteel));
if (false) { // //TODO CONFIG !GregTechAPI.sSpecialFile.get(ConfigCategories.general, "DisableFlintTools", false)
ModHandler.addShapedRecipe(SWORD.getStackForm(Materials.Flint, Materials.Wood),
"F",
"F",
"S",
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
"F",
"F",
"S",
'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
ModHandler.addShapedRecipe(PICKAXE.getStackForm(Materials.Flint, Materials.Wood),
"FFF",
" S ",
" S ",
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
"FFF",
" S ",
" S ",
'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
ModHandler.addShapedRecipe(SHOVEL.getStackForm(Materials.Flint, Materials.Wood),
"F",
"S",
"S",
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
"F",
"S",
"S",
'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
ModHandler.addShapedRecipe(AXE.getStackForm(Materials.Flint, Materials.Wood),// true,
"FF",
"FS",
" S",
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
"FF",
"FS",
" S",
'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
ModHandler.addShapedRecipe(HOE.getStackForm(Materials.Flint, Materials.Wood),// true,
"FF",
" S",
" S",
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
"FF",
" S",
" S",
'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
ModHandler.addShapedRecipe(KNIFE.getStackForm(Materials.Flint, Materials.Wood),
"F",
"S",
'S', OreDictUnifier.get(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
"F",
"S",
'S', new UnificationEntry(OrePrefix.stick, Materials.Wood),
'F', new ItemStack(Items.FLINT, 1));
}
if (true) { //TODO CONFIG GregTechAPI.sRecipeFile.get(ConfigCategories.Tools.mortar, "Coal", true)
ModHandler.addShapelessRecipe(OreDictUnifier.get(OrePrefix.dust, Materials.Coal, 1),
ToolDictNames.craftingToolMortar,
new ItemStack(Items.COAL, 1));
ToolDictNames.craftingToolMortar,
new ItemStack(Items.COAL, 1));
}
if (true) { //TODO CONFIG GregTechAPI.sRecipeFile.get(ConfigCategories.Tools.mortar, "Clay", true)
ModHandler.addShapelessRecipe(OreDictUnifier.get(OrePrefix.dust, Materials.Clay, 1),
ToolDictNames.craftingToolMortar,
new ItemStack(Blocks.CLAY, 1));
ToolDictNames.craftingToolMortar,
new ItemStack(Blocks.CLAY, 1));
}
if (true) { // TODO CONFIG GregTechAPI.sRecipeFile.get(ConfigCategories.Tools.mortar, "Wheat", true)
ModHandler.addShapelessRecipe(OreDictUnifier.get(OrePrefix.dust, Materials.Wheat, 1),
ToolDictNames.craftingToolMortar,
new ItemStack(Items.WHEAT, 1));
ToolDictNames.craftingToolMortar,
new ItemStack(Items.WHEAT, 1));
}
if (true) { //TODO CONFIG GregTechAPI.sRecipeFile.get(ConfigCategories.Tools.mortar, "Clay", true)
ModHandler.addShapelessRecipe(new ItemStack(Items.FLINT, 1),
ToolDictNames.craftingToolMortar,
new ItemStack(Blocks.GRAVEL, 1));
ToolDictNames.craftingToolMortar,
new ItemStack(Blocks.GRAVEL, 1));
}
if (true) { //TODO CONFIG GregTechAPI.sRecipeFile.get(ConfigCategories.Tools.mortar, "Blaze", true)
ModHandler.addShapelessRecipe(new ItemStack(Items.BLAZE_POWDER, 2),
ToolDictNames.craftingToolMortar,
new ItemStack(Items.BLAZE_ROD, 1));
ToolDictNames.craftingToolMortar,
new ItemStack(Items.BLAZE_ROD, 1));
}
}
}

17
src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java → src/main/java/gregtech/loaders/preload/ItemBlockFluidLoader.java
View file

@ -1,26 +1,25 @@
package gregtech.loaders.preload;
import gregtech.api.util.GTLog;
import gregtech.common.blocks.MetaBlocks;
import gregtech.common.items.MetaItem2;
import gregtech.common.items.MetaItem1;
import gregtech.common.items.MetaItems;
import gregtech.common.items.MetaTool;
public class GT_Loader_Item_Block_And_Fluid
implements Runnable {
public class ItemBlockFluidLoader implements Runnable {
public void run() {
// Materials.Water.mFluid = (Materials.Ice.mFluid = GT_ModHandler.getWater(1000L).getFluid());
// Materials.Lava.mFluid = GT_ModHandler.getLava(1000L).getFluid();
GTLog.logger.info("Registering Items.");
// new GT_IntegratedCircuit_Item();
new MetaItem1();
new MetaItem2();
new MetaTool();
new OreDictionaryLoader().run();
new UnificationDataLoader().run();
new OreProcessingLoader().run();
new MaterialInfoLoader().run();
MetaItems.init();
// MetaBlocks.init();
// ItemList.Rotor_LV.set(OreDictionaryUnifier.get(OrePrefix.rotor, Materials.Tin, 1));
// ItemList.Rotor_MV.set(OreDictionaryUnifier.get(OrePrefix.rotor, Materials.Bronze, 1));

2
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java → src/main/java/gregtech/loaders/preload/MTELoader.java
View file

@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.fml.common.Loader;
public class GT_Loader_MetaTileEntities implements Runnable {
public class MTELoader implements Runnable {
private static final String aTextWire1 = "wire.";
private static final String aTextCable1 = "cable.";
private static final String aTextWire2 = " Wire";

24
src/main/java/gregtech/loaders/preload/UnificationDataLoader.java → src/main/java/gregtech/loaders/preload/MaterialInfoLoader.java
View file

@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack;
import static gregtech.api.GTValues.M;
import static gregtech.api.GTValues.W;
public class UnificationDataLoader implements Runnable {
public class MaterialInfoLoader implements Runnable {
public void run() {
GTLog.logger.info("Loading Item Data Tags");
@ -40,7 +40,7 @@ public class UnificationDataLoader implements Runnable {
OreDictUnifier.registerOre(new ItemStack(Blocks.SNOW, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Snow, M)));
OreDictUnifier.registerOre(new ItemStack(Blocks.GLOWSTONE, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Glowstone, 14515200L)));
OreDictUnifier.registerOre(new ItemStack(Blocks.REDSTONE_LAMP, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Glowstone, 14515200L), new MaterialStack(Materials.Redstone, OrePrefix.dust.materialAmount * 4L)));
OreDictUnifier.registerOre(new ItemStack(Blocks.LIT_REDSTONE_LAMP, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Glowstone, 14515200L), new MaterialStack(Materials.Redstone, OrePrefix.dust.materialAmount * 4L)));
// OreDictUnifier.registerOre(new ItemStack(Blocks.LIT_REDSTONE_LAMP, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Glowstone, 14515200L), new MaterialStack(Materials.Redstone, OrePrefix.dust.materialAmount * 4L)));
OreDictUnifier.registerOre(ModHandler.getModItem("Forestry", "craftingMaterial", 1, 5), new ItemMaterialInfo(new MaterialStack(Materials.Ice, M)));
OreDictUnifier.registerOre(new ItemStack(Blocks.ICE, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Ice, M)));
OreDictUnifier.registerOre(new ItemStack(Blocks.PACKED_ICE, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Ice, 7257600L)));
@ -104,22 +104,22 @@ public class UnificationDataLoader implements Runnable {
OreDictUnifier.registerOre(new ItemStack(Blocks.SNOW_LAYER, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Snow, -1)));
OreDictUnifier.registerOre(new ItemStack(Blocks.STONE_SLAB, 1, 0), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 1814400L)));
OreDictUnifier.registerOre(new ItemStack(Blocks.STONE_SLAB, 1, 8), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 1814400L)));
OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 0), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M)));
OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 8), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M)));
// OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 0), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M)));
// OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 8), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M)));
OreDictUnifier.registerOre(new ItemStack(Blocks.STONE_SLAB, 1, 2), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 1814400L)));
OreDictUnifier.registerOre(new ItemStack(Blocks.STONE_SLAB, 1, 10), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 1814400L)));
OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 2), new ItemMaterialInfo(new MaterialStack(Materials.Wood, M)));
OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 10), new ItemMaterialInfo(new MaterialStack(Materials.Wood, M)));
// OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 2), new ItemMaterialInfo(new MaterialStack(Materials.Wood, M)));
// OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 10), new ItemMaterialInfo(new MaterialStack(Materials.Wood, M)));
OreDictUnifier.registerOre(new ItemStack(Blocks.STONE_SLAB, 1, 3), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 1814400L)));
OreDictUnifier.registerOre(new ItemStack(Blocks.STONE_SLAB, 1, 11), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 1814400L)));
OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 3), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M)));
OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 11), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M)));
// OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 3), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M)));
// OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 11), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M)));
OreDictUnifier.registerOre(new ItemStack(Blocks.STONE_SLAB, 1, 5), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 1814400L)));
OreDictUnifier.registerOre(new ItemStack(Blocks.STONE_SLAB, 1, 13), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 1814400L)));
OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 5), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M)));
OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 13), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M)));
// OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 5), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M)));
// OreDictUnifier.registerOre(new ItemStack(Blocks.DOUBLE_STONE_SLAB, 1, 13), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M)));
OreDictUnifier.registerOre(new ItemStack(Blocks.FURNACE, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 29030400L)));
OreDictUnifier.registerOre(new ItemStack(Blocks.LIT_FURNACE, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 29030400L)));
// OreDictUnifier.registerOre(new ItemStack(Blocks.LIT_FURNACE, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Stone, 29030400L)));
OreDictUnifier.registerOre(new ItemStack(Blocks.STONEBRICK, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M)));
OreDictUnifier.registerOre(new ItemStack(Blocks.STONE, 1, 0), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M)));
@ -144,7 +144,7 @@ public class UnificationDataLoader implements Runnable {
OreDictUnifier.registerOre(new ItemStack(Blocks.CHEST, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 29030400L)));
OreDictUnifier.registerOre(new ItemStack(Blocks.TRAPPED_CHEST, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 32659200L), new MaterialStack(Materials.Iron, OrePrefix.ring.materialAmount * 2L)));
OreDictUnifier.registerOre(new ItemStack(Blocks.REDSTONE_TORCH, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 1814400L), new MaterialStack(Materials.Redstone, M)));
OreDictUnifier.registerOre(new ItemStack(Blocks.UNLIT_REDSTONE_TORCH, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 1814400L), new MaterialStack(Materials.Redstone, M)));
// OreDictUnifier.registerOre(new ItemStack(Blocks.UNLIT_REDSTONE_TORCH, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 1814400L), new MaterialStack(Materials.Redstone, M)));
OreDictUnifier.registerOre(new ItemStack(Blocks.NOTEBLOCK, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 29030400L), new MaterialStack(Materials.Redstone, M)));
OreDictUnifier.registerOre(new ItemStack(Blocks.JUKEBOX, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 29030400L), new MaterialStack(Materials.Diamond, M)));
OreDictUnifier.registerOre(new ItemStack(Blocks.CRAFTING_TABLE, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Wood, 14515200L)));

21
src/main/java/gregtech/loaders/preload/OreDictionaryLoader.java
View file

@ -45,7 +45,6 @@ public class OreDictionaryLoader implements Runnable {
OreDictUnifier.registerOre(new ItemStack(Blocks.IRON_ORE, 1), OrePrefix.ore, Materials.Iron);
OreDictUnifier.registerOre(new ItemStack(Blocks.LAPIS_ORE, 1), OrePrefix.ore, Materials.Lapis);
OreDictUnifier.registerOre(new ItemStack(Blocks.REDSTONE_ORE, 1), OrePrefix.ore, Materials.Redstone);
OreDictUnifier.registerOre(new ItemStack(Blocks.LIT_REDSTONE_ORE, 1), OrePrefix.ore, Materials.Redstone);
OreDictUnifier.registerOre(new ItemStack(Blocks.GOLD_ORE, 1), OrePrefix.ore, Materials.Gold);
OreDictUnifier.registerOre(new ItemStack(Blocks.DIAMOND_ORE, 1), OrePrefix.ore, Materials.Diamond);
OreDictUnifier.registerOre(new ItemStack(Blocks.EMERALD_ORE, 1), OrePrefix.ore, Materials.Emerald);
@ -120,49 +119,47 @@ public class OreDictionaryLoader implements Runnable {
OreDictUnifier.registerOre(ItemCable.getCable(CableType.tin, 1), "craftingWireTin");
OreDictUnifier.registerOre(new ItemStack(Blocks.REDSTONE_TORCH, 1, W), "craftingRedstoneTorch");
OreDictUnifier.registerOre(new ItemStack(Blocks.UNLIT_REDSTONE_TORCH, 1, W), "craftingRedstoneTorch");
OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1), "craftingWorkBench");
OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 16), "craftingWorkBench");
// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1), "craftingWorkBench");
// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 16), "craftingWorkBench");
OreDictUnifier.registerOre(new ItemStack(Blocks.PISTON, 1, W), "craftingPiston");
OreDictUnifier.registerOre(new ItemStack(Blocks.STICKY_PISTON, 1, W), "craftingPiston");
OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 45), "craftingSafe");
// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 45), "craftingSafe");
OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.personal_chest, 1), "craftingSafe");
OreDictUnifier.registerOre(new ItemStack(Blocks.CHEST, 1, W), "craftingChest");
OreDictUnifier.registerOre(new ItemStack(Blocks.TRAPPED_CHEST, 1, W), "craftingChest");
OreDictUnifier.registerOre(new ItemStack(Blocks.FURNACE, 1, W), "craftingFurnace");
OreDictUnifier.registerOre(new ItemStack(Blocks.LIT_FURNACE, 1, W), "craftingFurnace");
OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.pump, 1), "craftingPump");
OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.magnetizer, 1), "craftingElectromagnet");
OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.teleporter, 1), "craftingTeleporter");
OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.macerator, 1), "craftingMacerator");
OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 50), "craftingMacerator");
// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 50), "craftingMacerator");
OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.extractor, 1), "craftingExtractor");
OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 51), "craftingExtractor");
// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 51), "craftingExtractor");
OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.compressor, 1), "craftingCompressor");
OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 52), "craftingCompressor");
// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 52), "craftingCompressor");
OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.recycler, 1), "craftingRecycler");
OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 53), "craftingRecycler");
// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 53), "craftingRecycler");
OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.iron_furnace, 1), "craftingIronFurnace");
OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 62), "craftingCentrifuge");
// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 62), "craftingCentrifuge");
OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.induction_furnace, 1), "craftingInductionFurnace");
OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.electric_furnace, 1), "craftingElectricFurnace");
OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 54), "craftingElectricFurnace");
// OreDictUnifier.registerOre(new ItemStack(MetaBlocks.MACHINE, 1, 54), "craftingElectricFurnace");
OreDictUnifier.registerOre(ModHandler.IC2.getIC2TEItem(TeBlock.generator, 1), "craftingGenerator");