Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lead drum and latex fix #24

Merged
merged 3 commits into from
Apr 13, 2023
Merged

Lead drum and latex fix #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e184be
Lead Drum and Latex temperature fix
loxoDev Apr 12, 2023
99a8adb
Lead Drum and Latex temperature fix
loxoDev Apr 12, 2023
181e933
Merge remote-tracking branch 'origin/lead_drum' into lead_drum
loxoDev Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/main/java/supersymmetry/common/materials/SuSyUnknownCompositionMaterials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package supersymmetry.common.materials;

import gregtech.api.fluids.fluidType.FluidTypes;
import gregtech.api.unification.material.Material;

import static supersymmetry.common.materials.SusyMaterials.*;
Expand All @@ -8,10 +9,8 @@ public class SuSyUnknownCompositionMaterials {

public static void init() {
Latex = new Material.Builder(27050, "latex")
.dust().fluid(FluidTypes.LIQUID)
.color(0xFFFADA)
.dust()
.fluid()
.fluidTemp(293)
.build();
}
}
8 changes: 5 additions & 3 deletions src/main/java/supersymmetry/common/materials/SusyMaterials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

import gregtech.api.unification.material.Material;
import gregtech.api.unification.material.Materials;
import gregtech.api.unification.material.properties.IMaterialProperty;
import gregtech.api.unification.material.properties.MaterialProperties;
import gregtech.api.unification.material.properties.PropertyKey;
import gregtech.api.unification.material.properties.*;
import supersymmetry.api.SusyLog;

import java.lang.reflect.Field;
Expand Down Expand Up @@ -48,13 +46,17 @@ public static void init() {
SuSyOrganicChemistryMaterials.init();
SuSyHighDegreeMaterials.init();
SuSyUnknownCompositionMaterials.init();

Latex.getProperty(PropertyKey.FLUID).setFluidTemperature(293);
}

private static void changeProperties() {
//removeProperty(PropertyKey.ORE, Materials.Graphite);
removeProperty(PropertyKey.ORE, Materials.Soapstone);
removeProperty(PropertyKey.ORE, Materials.Quartzite);
removeProperty(PropertyKey.ORE, Materials.Mica);
removeProperty(PropertyKey.FLUID_PIPE, Materials.Lead);
Materials.Lead.setProperty(PropertyKey.FLUID_PIPE, new FluidPipeProperties(1200, 8, true, true, false, false));
}

private static void removeProperty(PropertyKey<?> key, Material material) {
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

import gregtech.api.GTValues;
import gregtech.api.metatileentity.SimpleMachineMetaTileEntity;
import gregtech.api.unification.material.Materials;
import gregtech.client.renderer.texture.Textures;
import gregtech.common.metatileentities.MetaTileEntities;
import gregtech.common.metatileentities.storage.MetaTileEntityDrum;
import net.minecraft.util.ResourceLocation;
import org.jetbrains.annotations.NotNull;
import supersymmetry.api.recipes.SuSyRecipeMaps;
Expand Down Expand Up @@ -38,6 +39,8 @@ public class SuSyMetaTileEntities {
public static MetaTileEntitySteamVacuumChamber VACUUM_CHAMBER_BRONZE;
public static SimpleMachineMetaTileEntity[] VACUUM_CHAMBER;

public static MetaTileEntityDrum LEAD_DRUM;

public static void init() {
MAGNETIC_REFRIGERATOR = registerMetaTileEntity(14500, new MetaTileEntityMagneticRefrigerator(susyId("magnetic_refrigerator")));
COAGULATION_TANK = registerMetaTileEntity(14501, new MetaTileEntityCoagulationTank(susyId("coagulation_tank")));
Expand Down Expand Up @@ -91,6 +94,8 @@ public static void init() {
VACUUM_CHAMBER[10] = registerMetaTileEntity(14548, new SimpleMachineMetaTileEntity(susyId("vacuum_chamber.uiv"), SuSyRecipeMaps.VACUUM_CHAMBER, Textures.GAS_COLLECTOR_OVERLAY, 11, true));
VACUUM_CHAMBER[11] = registerMetaTileEntity(14549, new SimpleMachineMetaTileEntity(susyId("vacuum_chamber.uxv"), SuSyRecipeMaps.VACUUM_CHAMBER, Textures.GAS_COLLECTOR_OVERLAY, 12, true));
VACUUM_CHAMBER[12] = registerMetaTileEntity(14550, new SimpleMachineMetaTileEntity(susyId("vacuum_chamber.opv"), SuSyRecipeMaps.VACUUM_CHAMBER, Textures.GAS_COLLECTOR_OVERLAY,13, true));

LEAD_DRUM = registerMetaTileEntity(14551, new MetaTileEntityDrum(susyId("drum.lead"), Materials.Lead, 32000));
}

private static @NotNull ResourceLocation susyId(@NotNull String name) {
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/susy/lang/en_us.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ gregtech.multiblocks.sintering_oven.use_plasma.affirmative=Yes
gregtech.multiblocks.sintering_oven.use_plasma.negative=No

gregtech.machine.coagulation_tank.name=Coagulation Tank
gregtech.machine.drum.lead.name=Lead Drum

# Properties
gregtech.recipe.plasma_requirement=Requires plasma: %s
Expand Down