Skip to content

Commit

Permalink
Most work on UHV+ tiers
Browse files Browse the repository at this point in the history 
add unimplemented tooltips to most machines, still need to do UEV+ casings and recipes
  • Loading branch information
@serenibyss
serenibyss committed Jun 23, 2021
1 parent 2051047 commit 6155d82
Show file tree
Hide file tree
Showing 42 changed files with 1,113 additions and 491 deletions.
2 changes: 1 addition & 1 deletion src/main/java/gregtech/GregTechMod.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
import net.minecraftforge.fml.relauncher.SideOnly;

@Mod(modid = GTValues.MODID,
name = "GregTech Community Edition",
name = "GregTech",
acceptedMinecraftVersions = "[1.12,1.13)",
dependencies = "required:forge@[14.23.5.2847,);" + CodeChickenLib.MOD_VERSION_DEP + "after:forestry;after:jei@[4.15.0,);after:crafttweaker;")
public class GregTechMod {
Expand Down
18 changes: 13 additions & 5 deletions src/main/java/gregtech/api/GTValues.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ public class GTValues {
/**
* The Voltage Tiers. Use this Array instead of the old named Voltage Variables
*/
public static final long[] V = new long[]{8, 32, 128, 512, 2048, 8192, 32768, 131072, 524288, Integer.MAX_VALUE};
public static final long[] V = new long[]{8, 32, 128, 512, 2048, 8192, 32768, 131072, 524288, 2097152, 8388608, 33554432, 134217728, 536870912, Integer.MAX_VALUE};
public static final int OldVLength = 10; // TODO Remove all uses of this

public static final int ULV = 0;
public static final int LV = 1;
Expand All @@ -50,22 +51,29 @@ public class GTValues {
public static final int LuV = 6;
public static final int ZPM = 7;
public static final int UV = 8;
public static final int MAX = 9;

public static final int UHV = 9;
public static final int UEV = 10;
public static final int UIV = 11;
public static final int UMV = 12;
public static final int UXV = 13;
public static final int MAX = 14;

/**
* The short names for the voltages
*/
public static final String[] VN = new String[] {"ULV", "LV", "MV", "HV", "EV", "IV", "LuV", "ZPM", "UV", "MAX"};
public static final String[] VN = new String[] {"ULV", "LV", "MV", "HV", "EV", "IV", "LuV", "ZPM", "UV", "UHV", "UEV", "UIV", "UMV", "UXV", "MAX"};

/**
* Color values for the voltages
*/
public static final int[] VC = new int[] {0xDCDCDC, 0xDCDCDC, 0xFF6400, 0xFFFF1E, 0x808080, 0xF0F0F5, 0xF0F0F5, 0xF0F0F5, 0xF0F0F5, 0xF0F0F5};
public static final int[] VC = new int[] {0xDCDCDC, 0xDCDCDC, 0xFF6400, 0xFFFF1E, 0x808080, 0xF0F0F5, 0xF0F0F5, 0xF0F0F5, 0xF0F0F5, 0xF0F0F5, 0xF0F0F5, 0xF0F0F5, 0xF0F0F5, 0xF0F0F5, 0xF0F0F5}; // todo do this better

/**
* The long names for the voltages
*/
public static final String[] VOLTAGE_NAMES = new String[] {"Ultra Low Voltage", "Low Voltage", "Medium Voltage", "High Voltage", "Extreme Voltage", "Insane Voltage", "Ludicrous Voltage", "ZPM Voltage", "Ultimate Voltage", "Maximum Voltage"};
public static final String[] VOLTAGE_NAMES = new String[] {"Ultra Low Voltage", "Low Voltage", "Medium Voltage", "High Voltage", "Extreme Voltage", "Insane Voltage", "Ludicrous Voltage", "ZPM Voltage", "Ultimate Voltage",
"Highly Ultimate Voltage", "Extremely Ultimate Voltage", "Insanely Ultimate Voltage", "Mega Ultimate Voltage", "Extended Mega Ultimate Voltage", "Maximum Voltage"};

/**
* ModID strings, since they are quite common parameters
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/gregtech/api/metatileentity/SimpleMachineMetaTileEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import gregtech.api.recipes.RecipeMap;
import gregtech.api.render.OrientedOverlayRenderer;
import gregtech.api.render.Textures;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
Expand All @@ -33,6 +34,7 @@
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler;
Expand All @@ -42,6 +44,9 @@
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemStackHandler;

import javax.annotation.Nullable;
import java.util.List;

public class SimpleMachineMetaTileEntity extends WorkableTieredMetaTileEntity implements IActiveOutputSide {

private final boolean hasFrontFacing;
Expand Down Expand Up @@ -358,6 +363,13 @@ protected ModularUI createUI(EntityPlayer entityPlayer) {
return createGuiTemplate(entityPlayer).build(getHolder(), entityPlayer);
}

@Override
public void addInformation(ItemStack stack, @Nullable World player, List<String> tooltip, boolean advanced) {
super.addInformation(stack, player, tooltip, advanced);
String key = this.metaTileEntityId.getPath().split("\\.")[0];
tooltip.add(1, I18n.format(String.format("gregtech.machine.%s.tooltip", key)));
}

public interface RecipeMapWithConfigButton {
int getLeftButtonOffset();

Expand Down
123 changes: 115 additions & 8 deletions src/main/java/gregtech/common/ConfigHolder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
@Config(modid = GTValues.MODID)
public class ConfigHolder {

@Config.Comment("Category of options added by GregTechCE Unofficial")
@Config.Name("Unofficial Options")
public static UnofficialOptions U = new UnofficialOptions();

@Config.Comment("Whether to enable more verbose logging. Default: false")
public static boolean debug = false;

Expand Down Expand Up @@ -81,13 +85,12 @@ public class ConfigHolder {
public static boolean addFoodMethaneRecipes = true;

@Config.Comment("Category that contains configs for changing vanilla recipes")
@Config.Name("Vanilla Recipe Options")
@Config.RequiresMcRestart
public static VanillaRecipes vanillaRecipes = new VanillaRecipes();

@Config.Comment("Category that contains configs for machines with specific behavior")
public static MachineSpecificConfiguration machineSpecific = new MachineSpecificConfiguration();

@Config.Comment("Category that contains configs for the NanoSaber")
@Config.Name("Nano Saber Options")
public static NanoSaberConfiguration nanoSaberConfiguration = new NanoSaberConfiguration();

@Config.Comment("Sets the bonus EU output of Steam Turbines. Default: 6144")
Expand All @@ -109,6 +112,9 @@ public class ConfigHolder {
@Config.RequiresMcRestart
public static boolean doLosslessWiresMakeLossyCables = false;

@Config.Comment("Array of blacklisted dimension IDs in which Air Collector does not work. Default: none")
public static int[] airCollectorDimensionBlacklist = new int[]{};

public static class VanillaRecipes {

@Config.Comment("Whether to nerf the paper crafting recipe. Default: true")
Expand All @@ -133,11 +139,6 @@ public static class VanillaRecipes {
public boolean bowlRequireKnife = true;
}

public static class MachineSpecificConfiguration {
@Config.Comment("Array of blacklisted dimension IDs in which Air Collector does not work.")
public int[] airCollectorDimensionBlacklist = new int[]{};
}

public static class NanoSaberConfiguration {

@Config.RangeDouble(min = 0, max = 100)
Expand All @@ -158,4 +159,110 @@ public static class NanoSaberConfiguration {
@Config.RequiresMcRestart
public int energyConsumption = 64;
}

public static class UnofficialOptions {

@Config.Comment("Config category for enabling higher-tier machines.")
@Config.Name("Higher Tier Machines")
public HighTierMachines machines = new HighTierMachines();

public static class HighTierMachines {

@Config.Comment("Enable all LuV-UV Machines, overrides individual values if true. Default: false")
@Config.Name("LuV-UV Machines")
public boolean midTierMachines = true;

@Config.Comment("Enable all UHV-UXV Machines, overrides individual values if true. Default: false")
@Config.Name("UHV-UXV Machines")
public boolean highTierMachines = true;

@Config.Comment("Set these to true to enable LuV-UV tiers of machines. Default (all): false")
public boolean midTierAlloySmelter = false;
public boolean midTierArcFurnaces = false;
public boolean midTierAssemblers = false;
public boolean midTierAutoclaves = false;
public boolean midTierBenders = false;
public boolean midTierBreweries = false;
public boolean midTierCanners = false;
public boolean midTierCentrifuges = false;
public boolean midTierChemicalBaths = false;
public boolean midTierChemicalReactors = false;
public boolean midTierCompressors = false;
public boolean midTierCutters = false;
//public boolean midTierClusterMills = false;
public boolean midTierDistilleries = false;
public boolean midTierElectricFurnace = false;
public boolean midTierElectrolyzers = false;
public boolean midTierElectromagneticSeparators = false;
public boolean midTierExtractors = false;
public boolean midTierExtruders = false;
public boolean midTierFermenters = false;
public boolean midTierFluidCanners = false;
public boolean midTierFluidExtractors = false;
public boolean midTierFluidHeaters = false;
public boolean midTierFluidSolidifiers = false;
public boolean midTierForgeHammers = false;
public boolean midTierFormingPresses = false;
public boolean midTierLathes = false;
public boolean midTierMicrowaves = false;
public boolean midTierMixers = false;
public boolean midTierOreWashers = false;
public boolean midTierPackers = false;
public boolean midTierPlasmaArcFurnaces = false;
public boolean midTierPolarizers = false;
public boolean midTierLaserEngravers = false;
public boolean midTierPumps = false;
public boolean midTierReplicators = false;
public boolean midTierSifters = false;
public boolean midTierThermalCentrifuges = false;
public boolean midTierMacerators = false;
public boolean midTierMassFabs = false;
public boolean midTierUnpackers = false;
public boolean midTierWiremills = false;

@Config.Comment("Set these to true to enable UHV-UXV tiers of machines. Default (all): false")
public boolean highTierAlloySmelter = false;
public boolean highTierArcFurnaces = false;
public boolean highTierAssemblers = false;
public boolean highTierAutoclaves = false;
public boolean highTierBenders = false;
public boolean highTierBreweries = false;
public boolean highTierCanners = false;
public boolean highTierCentrifuges = false;
public boolean highTierChemicalBaths = false;
public boolean highTierChemicalReactors = false;
public boolean highTierCompressors = false;
public boolean highTierCutters = false;
//public boolean highTierClusterMills = false;
public boolean highTierDistilleries = false;
public boolean highTierElectricFurnace = false;
public boolean highTierElectrolyzers = false;
public boolean highTierElectromagneticSeparators = false;
public boolean highTierExtractors = false;
public boolean highTierExtruders = false;
public boolean highTierFermenters = false;
public boolean highTierFluidCanners = false;
public boolean highTierFluidExtractors = false;
public boolean highTierFluidHeaters = false;
public boolean highTierFluidSolidifiers = false;
public boolean highTierForgeHammers = false;
public boolean highTierFormingPresses = false;
public boolean highTierLathes = false;
public boolean highTierMicrowaves = false;
public boolean highTierMixers = false;
public boolean highTierOreWashers = false;
public boolean highTierPackers = false;
public boolean highTierPlasmaArcFurnaces = false;
public boolean highTierPolarizers = false;
public boolean highTierLaserEngravers = false;
public boolean highTierPumps = false;
public boolean highTierReplicators = false;
public boolean highTierSifters = false;
public boolean highTierThermalCentrifuges = false;
public boolean highTierMacerators = false;
public boolean highTierMassFabs = false;
public boolean highTierUnpackers = false;
public boolean highTierWiremills = false;
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/gregtech/common/blocks/BlockMachineCasing.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public enum MachineCasingType implements IStringSerializable {
LuV("ludicrous_voltage"),
ZPM("zero_point_module"),
UV("ultra_voltage"),
MAX("maximum_voltage"),
UHV("highly_ultimate_voltage"),
BRONZE_HULL("bronze_hull"),
BRONZE_BRICKS_HULL("bronze_bricks_hull"),
STEEL_HULL("steel_hull"),
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/gregtech/common/blocks/VariantBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ protected BlockStateContainer createBlockState() {
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, @Nullable World player, List<String> tooltip, ITooltipFlag advanced) {
//basic tooltip for all variant blocks
tooltip.add(I18n.format("tile.machine_casing.tooltip1"));
tooltip.add(I18n.format("tile.machine_casing.tooltip2"));
//tier less tooltip like: tile.turbine_casing.tooltip
String unlocalizedVariantTooltip = getTranslationKey() + ".tooltip";
if (I18n.hasKey(unlocalizedVariantTooltip))
Expand Down
Loading

0 comments on commit 6155d82

Please sign in to comment.