Skip to content
This repository has been archived by the owner on Nov 5, 2024. It is now read-only.

Commit

Permalink
changed fusion to be only 1 tier instead of 3
Browse files Browse the repository at this point in the history
  • Loading branch information
@Trinsdar
Trinsdar committed Oct 29, 2023
1 parent da968db commit 1e1c785
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 33 deletions.
16 changes: 0 additions & 16 deletions common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityFusionReactor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,6 @@ public Display getDisplay() {
return display;
}

public Block getCoil(){
if (tier == LUV){
return GregTechData.COIL_SUPERCONDUCTOR;
}
return GregTechData.COIL_FUSION;
}

public Block getCasing(){
if (tier == LUV){
return GregTechData.CASING_LUV;
} else if (tier == ZPM){
return GregTechData.CASING_FUSION_1;
}
return GregTechData.CASING_FUSION_2;
}

@Override
public void saveAdditional(CompoundTag tag) {
super.saveAdditional(tag);
Expand Down
4 changes: 1 addition & 3 deletions common/src/main/java/muramasa/gregtech/data/GregTechData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import muramasa.gregtech.block.BlockCoil.CoilData;
import muramasa.gregtech.cover.*;
import muramasa.gregtech.cover.redstone.CoverRedstoneMachineController;
import muramasa.gregtech.items.ItemPowerUnit;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack;
Expand Down Expand Up @@ -337,8 +336,7 @@ public Texture[] getTextures() {
public static final BlockCasing CASING_PIPE_TUNGSTENSTEEL = new BlockCasing(GTIRef.ID, "tungstensteel_pipe_casing");
public static final BlockCasing CASING_ENGINE_INTAKE = new BlockCasing(GTIRef.ID, "engine_intake_casing");

public static final BlockCasing CASING_FUSION_1 = new BlockCasing(GTIRef.ID, "fusion_1");
public static final BlockCasing CASING_FUSION_2 = new BlockCasing(GTIRef.ID, "fusion_2");
public static final BlockCasing CASING_FUSION = new BlockCasing(GTIRef.ID, "fusion_casing");

public static final BlockCasing CASING_TURBINE_STEEL = new BlockCasing(GTIRef.ID, "steel_turbine_casing");
public static final BlockCasing CASING_TURBINE_STAINLESS = new BlockCasing(GTIRef.ID, "stainless_steel_turbine_casing");
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/muramasa/gregtech/data/Machines.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public class Machines {
public static MultiMachine CRACKING_UNIT = new MultiMachine(GTIRef.ID, "cracking_unit").setTiers(HV).setMap(CRACKING).addFlags(GUI, ITEM, FLUID, ENERGY).setTile(BlockEntityOilCrackingUnit::new).custom();
public static MultiMachine DISTLLATION_TOWER = new MultiMachine(GTIRef.ID, "distillation_tower").setTiers(HV).setMap(DISTILLATION).addFlags(GUI, ITEM, FLUID,ENERGY).setTile(BlockEntityDistillationTower::new).custom();
public static MultiMachine CRYO_DISTLLATION_TOWER = new MultiMachine(GTIRef.ID, "cryo_distillation_tower").setTiers(HV).setMap(CRYO_DISTILLATION).addFlags(GUI, ITEM, FLUID,ENERGY).setTile(BlockEntityDistillationTower::new).custom();
public static MultiMachine FUSION_REACTOR = new MultiMachine(GTIRef.ID, "fusion_control_computer").setTiers(LUV, ZPM, UV).setMap(FUSION).addFlags(GUI, FLUID,ENERGY).setTile(BlockEntityFusionReactor::new);
public static MultiMachine FUSION_REACTOR = new MultiMachine(GTIRef.ID, "fusion_control_computer").setTiers(LUV).setMap(FUSION).addFlags(GUI, FLUID,ENERGY).setTile(BlockEntityFusionReactor::new);
public static MultiMachine HEAT_EXCHANGER = new MultiMachine(GTIRef.ID, "heat_exchanger").setTiers(EV).setMap(HEAT_EXCHANGING).addFlags(GUI, FLUID, ENERGY).setTile(BlockEntityHeatExchanger::new).custom();
public static MultiMachine IMPLOSION_COMPRESSOR = new MultiMachine(GTIRef.ID, "implosion_compressor").setTiers(HV).setMap(IMPLOSION_COMPRESSING).addFlags(GUI, ITEM, ENERGY).setTile(BlockEntityImplosionCompressor::new);
public static MultiMachine LARGE_BOILER = new MultiMachine(GTIRef.ID, "large_boiler").setTiers(LV, MV, HV, EV).addFlags(GUI, ITEM, FLUID).setMap(LARGE_BOILERS).setTile(BlockEntityLargeBoiler::new).custom();
Expand Down
8 changes: 4 additions & 4 deletions common/src/main/java/muramasa/gregtech/data/Structures.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,16 +226,16 @@ public static void init() {
" ECCX~XCCE ",
" OOCCCOO ",
" XOX ").of(0).build()
.atElement('O', lazy(t -> ofBlock(t.getCasing()))).atElement('C', lazy(t -> ofBlock(t.getCoil())))
.at('O', CASING_FUSION).at('C', COIL_FUSION)
.atElement('B', StructureUtility.<BlockEntityFusionReactor>ofChain(
lazy(t -> ofBlock(t.getCasing())),
ofBlock(CASING_FUSION),
ofHatch(HATCH_FLUID_I),
ofHatch(HATCH_ITEM_I)))
.atElement('X', StructureUtility.<BlockEntityFusionReactor>ofChain(
lazy(t -> ofBlock(t.getCasing())),
ofBlock(CASING_FUSION),
ofHatch(HATCH_FLUID_O),
ofHatch(HATCH_ITEM_O)))
.atElement('E', StructureUtility.<BlockEntityFusionReactor>ofChain(lazy(t -> ofBlock(t.getCasing())), ofHatch(HATCH_ENERGY)))
.atElement('E', StructureUtility.<BlockEntityFusionReactor>ofChain(ofBlock(CASING_FUSION), ofHatch(HATCH_ENERGY)))
.offset(7, 1, 12).min(2, HATCH_FLUID_I).min(1, HATCH_FLUID_O).min(4, HATCH_ENERGY).build());
}

Expand Down
4 changes: 0 additions & 4 deletions common/src/main/java/muramasa/gregtech/datagen/GregTechLocalizations.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ protected void addTranslations() {
protected void english(String domain, String locale) {
super.english(domain, locale);
AntimatterAPI.all(BlockCasing.class, domain).forEach(i -> {
if (i.getId().contains("fusion")){
add(i, "Fusion Casing MK " + i.getId().replace("fusion_", ""));
return;
}
if (i.getId().startsWith("casing_") || i.getId().startsWith("hull_")){
add(i, lowerUnderscoreToUpperSpacedRotated(i.getId()));
return;
Expand Down
7 changes: 3 additions & 4 deletions common/src/main/java/muramasa/gregtech/loader/crafting/BlockParts.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import muramasa.antimatter.AntimatterAPI;
import muramasa.antimatter.data.AntimatterDefaultTools;
import muramasa.antimatter.data.AntimatterMaterialTypes;
import muramasa.antimatter.data.AntimatterMaterials;
import muramasa.antimatter.datagen.providers.AntimatterRecipeProvider;
import muramasa.antimatter.machine.Tier;
import muramasa.antimatter.material.Material;
Expand Down Expand Up @@ -136,14 +135,14 @@ public static void loadRecipes(Consumer<FinishedRecipe> output, AntimatterRecipe
ImmutableMap.<Character, Object>builder()
.put('P', PLATE.get(Steel))
.put('W', HAMMER.getTag()).build(), "PPP", "PWP", "PPP");
provider.addStackRecipe(output, GTIRef.ID, "", "gtblockparts", "has_wrench", provider.hasSafeItem(WRENCH.getTag()), new ItemStack(CASING_FUSION_1, 1),
provider.addStackRecipe(output, GTIRef.ID, "", "gtblockparts", "has_wrench", provider.hasSafeItem(WRENCH.getTag()), new ItemStack(CASING_FUSION, 1),
of('P', PLATE.getMaterialTag(TungstenSteel), 'W', WRENCH.getTag(), 'H', AntimatterDefaultTools.HAMMER.getTag(), 'F', CASING_LUV)
,
"PHP", "PFP", "PWP");
provider.addStackRecipe(output, GTIRef.ID, "", "gtblockparts", "has_wrench", provider.hasSafeItem(WRENCH.getTag()), new ItemStack(CASING_FUSION_2, 1),
/*provider.addStackRecipe(output, GTIRef.ID, "", "gtblockparts", "has_wrench", provider.hasSafeItem(WRENCH.getTag()), new ItemStack(CASING_FUSION_2, 1),
of('P', PLATE.getMaterialTag(Americium), 'W', WRENCH.getTag(), 'H', AntimatterDefaultTools.HAMMER.getTag(), 'F', CASING_FUSION_1)
,
"PHP", "PFP", "PWP");
"PHP", "PFP", "PWP");*/

//TODO make these also use annealed copper
provider.addItemRecipe(output, "long_distance_cables", "has_tin_cable", provider.hasSafeItem(CABLE_TIN.getBlockItem(PipeSize.HUGE)), LONG_DIST_WIRE_EV,
Expand Down
0 ...ts/gti/textures/block/casing/fusion_2.png → ...sets/gti/textures/block/casing/fusion.png
View file
File renamed without changes
2 changes: 1 addition & 1 deletion ...textures/block/casing/fusion_2.png.mcmeta → ...i/textures/block/casing/fusion.png.mcmeta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"ctm_version": 1,
"type": "ctm",
"textures": [
"gti:block/ct/fusion_2_ctm"
"gti:block/ct/fusion_ctm"
]
}
}
0 ...ts/gti/textures/block/ct/fusion_2_ctm.png → ...sets/gti/textures/block/ct/fusion_ctm.png
View file
File renamed without changes

0 comments on commit 1e1c785

Please sign in to comment.