Skip to content

Commit

Permalink
remove space shuttle
Browse files Browse the repository at this point in the history
  • Loading branch information
@screret
screret committed Oct 20, 2023
1 parent 9123f3f commit cadd9ce
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 187 deletions.
60 changes: 28 additions & 32 deletions common/src/main/java/argent_matter/gcys/common/data/GCySMachines.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import argent_matter.gcys.common.machine.electric.OxygenSpreaderMachine;
import argent_matter.gcys.common.machine.multiblock.electric.DysonSystemControllerMachine;
import argent_matter.gcys.common.machine.multiblock.RocketScannerMachine;
import argent_matter.gcys.common.machine.multiblock.electric.SpaceShuttleMachine;
import argent_matter.gcys.data.recipe.GCySTags;
import com.gregtechceu.gtceu.GTCEu;
import com.gregtechceu.gtceu.api.GTValues;
import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability;
import com.gregtechceu.gtceu.api.data.RotationState;
import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper;
import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
Expand All @@ -20,26 +20,33 @@
import com.gregtechceu.gtceu.api.pattern.FactoryBlockPattern;
import com.gregtechceu.gtceu.api.pattern.MultiblockShapeInfo;
import com.gregtechceu.gtceu.api.pattern.Predicates;
import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
import com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder;
import com.gregtechceu.gtceu.client.renderer.machine.TieredHullMachineRenderer;
import com.gregtechceu.gtceu.common.data.GTBlocks;
import com.gregtechceu.gtceu.common.data.GTMaterials;
import com.gregtechceu.gtceu.common.data.GTRecipeTypes;
import com.gregtechceu.gtceu.config.ConfigHolder;
import net.minecraft.core.Direction;
import net.minecraft.network.chat.Component;
import net.minecraft.world.level.block.Blocks;

import java.util.ArrayList;
import java.util.List;
import java.util.function.BiFunction;

import static argent_matter.gcys.api.registries.GcysRegistries.REGISTRATE;
import static argent_matter.gcys.common.data.GCySBlocks.*;
import static com.gregtechceu.gtceu.api.pattern.Predicates.*;
import static com.gregtechceu.gtceu.common.data.GCyMBlocks.CASING_ATOMIC;
import static com.gregtechceu.gtceu.common.data.GTBlocks.*;
import static com.gregtechceu.gtceu.common.data.GTMachines.*;
import static com.gregtechceu.gtceu.common.data.GTMachines.POWER_TRANSFORMER;

@SuppressWarnings({"Convert2MethodRef", "FunctionalExpressionCanBeFolded", "unused"})
public class GCySMachines {

public final static int[] HIGH_TIERS = new int[] {GTValues.IV, GTValues.LuV, GTValues.ZPM, GTValues.UV, GTValues.UHV};

public final static MachineDefinition[] OXYGEN_SPREADER = registerTieredMachines("oxygen_spreader", OxygenSpreaderMachine::new,
(tier, builder) -> builder
.rotationState(RotationState.NON_Y_AXIS)
Expand Down Expand Up @@ -95,7 +102,7 @@ public class GCySMachines {

public static final MultiblockMachineDefinition DYSON_SYSTEM_CONTROLLER = REGISTRATE.multiblock("dyson_system_controller", DysonSystemControllerMachine::new)
.rotationState(RotationState.NON_Y_AXIS)
.appearanceBlock(CASING_ATOMIC)
.appearanceBlock(() -> CASING_ATOMIC.get()) // You MUST do it like this, so that the GTBlocks/GCyMBlocks class isn't loaded too early. Because that causes a crash.
.recipeType(GCySRecipeTypes.DYSON_ENERGY_RECIPES)
.pattern(definition -> FactoryBlockPattern.start()
.aisle("CCCCCCC", "CCCCCCC", " F ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
Expand All @@ -120,7 +127,7 @@ public class GCySMachines {

public static final MultiblockMachineDefinition SPACE_ELEVATOR = REGISTRATE.multiblock("space_elevator", WorkableElectricMultiblockMachine::new)
.rotationState(RotationState.NON_Y_AXIS)
.appearanceBlock(CASING_TUNGSTENSTEEL_ROBUST)
.appearanceBlock(() -> CASING_TUNGSTENSTEEL_ROBUST.get())
.recipeType(GCySRecipeTypes.SPACE_ELEVATOR_RECIPES)
.pattern(definition -> FactoryBlockPattern.start()
.aisle(" KKKKKKK ", " BXXXB ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
Expand Down Expand Up @@ -162,37 +169,10 @@ public class GCySMachines {
GTCEu.id("block/multiblock/assembly_line"), false)
.register();

public static final MultiblockMachineDefinition SPACE_SHUTTLE = REGISTRATE.multiblock("space_shuttle", SpaceShuttleMachine::new)
.rotationState(RotationState.NON_Y_AXIS)
.appearanceBlock(CASING_TUNGSTENSTEEL_ROBUST)
.recipeType(GCySRecipeTypes.SPACE_SHUTTLE_RECIPES)
.pattern(definition -> FactoryBlockPattern.start()
.aisle("CCCCCCCCC", "CCCCCCCCC", " X X ", " XXX ", " X X ", " XXX ", " X X ", " XXX ", " X X ", " XXX ", " X X ", " ")
.aisle("CCCCCCCCC", "CCCCCCCCC", " X X ", " ", " X X ", " ", " X X ", " ", " X X ", " ", " X X ", " ")
.aisle("CCCCCCCCC", "CCCCCCCCC", " X X ", " XXX ", " X X ", " XXX ", " X X ", " XXX ", " X X ", " XXX ", " X X ", " ")
.aisle("CCCCCCCCC", "CCCCCCCCC", " ", " T ", " ", " ", " ", " ", " XXX ", " ", " ", " ")
.aisle("CCCCCCCCC", "CCCCCCCCC", " ", " T ", " T ", " T ", " ", " ", " XXX ", " ", " ", " ")
.aisle("CCCCCCCCC", "CCCCCCCCC", " A ", " TTT ", " TTT ", " TTT ", " TTT ", " TTT ", " TTT ", " TTT ", " B ", " ")
.aisle("CCCCCCCCC", " ", " A A ", " TTTTTTT ", " TTT TTT ", " TT TT ", " TT TT ", " T T ", " T T ", " T T ", " B B ", " B ")
.aisle("CCCCCCCCC", "CCCCCCCCC", " A ", " TTT ", " TTT ", " TTT ", " TTT ", " TTT ", " TTT ", " TTT ", " B ", " ")
.aisle("CCCCCCCCC", "CCCCSCCCC", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.where('S', controller(blocks(definition.getBlock())))
.where(' ', air())
.where('C', blocks(CASING_TUNGSTENSTEEL_ROBUST.get()).setMinGlobalLimited(110)
.or(Predicates.autoAbilities(definition.getRecipeTypes())))
.where('X', blocks(MATERIAL_BLOCKS.get(TagPrefix.frameGt, GTMaterials.StainlessSteel).get()))
.where('T', blocks(CASING_ALUMINIUM_AEROSPACE.get()))
.where('A', blocks(ROCKET_MOTOR.get()))
.where('B', blocks(MATERIAL_BLOCKS.get(TagPrefix.block, GCySMaterials.KaptonK).get()))
.build())
.workableCasingRenderer(GTCEu.id("block/casings/solid/machine_casing_robust_tungstensteel"),
GTCEu.id("block/multiblock/assembly_line"), false)
.register();

public static final MultiblockMachineDefinition DRONE_HANGAR = REGISTRATE.multiblock("drone_hangar", WorkableElectricMultiblockMachine::new)
.rotationState(RotationState.NON_Y_AXIS)
.recipeType(GTRecipeTypes.VACUUM_RECIPES)
.appearanceBlock(CASING_ALUMINIUM_FROSTPROOF)
.appearanceBlock(() -> CASING_ALUMINIUM_FROSTPROOF.get())
.pattern(definition -> FactoryBlockPattern.start()
.aisle("XXX", "XXX", "XXX")
.aisle("XXX", "X#X", "XXX")
Expand Down Expand Up @@ -220,6 +200,22 @@ public static MachineDefinition[] registerTieredMachines(String name,
return definitions;
}

public static Component explosion() {
if (ConfigHolder.INSTANCE.machines.doTerrainExplosion)
return Component.translatable("gtceu.universal.tooltip.terrain_resist");
return null;
}

public static Component[] workableTiered(int tier, long voltage, long energyCapacity, GTRecipeType recipeType, long tankCapacity, boolean input) {
List<Component> tooltipComponents = new ArrayList<>();
tooltipComponents.add(input ? Component.translatable("gtceu.universal.tooltip.voltage_in", voltage, GTValues.VNF[tier]) :
Component.translatable("gtceu.universal.tooltip.voltage_out", voltage, GTValues.VNF[tier]));
tooltipComponents.add(Component.translatable("gtceu.universal.tooltip.energy_storage_capacity", energyCapacity));
if (recipeType.getMaxInputs(FluidRecipeCapability.CAP) > 0 || recipeType.getMaxOutputs(FluidRecipeCapability.CAP) > 0)
tooltipComponents.add(Component.translatable("gtceu.universal.tooltip.fluid_storage_capacity", tankCapacity));
return tooltipComponents.toArray(Component[]::new);
}

public static void init() {

}
Expand Down
4 changes: 0 additions & 4 deletions common/src/main/java/argent_matter/gcys/common/data/GCySRecipeTypes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ public class GCySRecipeTypes {
.setProgressBar(GcysGuiTextures.PROGRESS_BAR_ROCKET, LEFT_TO_RIGHT)
.setSound(GTSoundEntries.TRICORDER_TOOL);

public static final GTRecipeType SPACE_SHUTTLE_RECIPES = register("space_shuttle", MULTIBLOCK).setMaxIOSize(4, 0, 2, 0).setEUIO(IO.IN)
.setProgressBar(GcysGuiTextures.PROGRESS_BAR_ROCKET, LEFT_TO_RIGHT)
.setSound(GCySSoundEntries.ROCKET);

public static GTRecipeType register(String name, String group, RecipeType<?>... proxyRecipes) {
var recipeType = new GTRecipeType(GCyS.id(name), group, proxyRecipes);
GTRegistries.register(BuiltInRegistries.RECIPE_TYPE, recipeType.registryName, recipeType);
Expand Down
151 changes: 0 additions & 151 deletions .../main/java/argent_matter/gcys/common/machine/multiblock/electric/SpaceShuttleMachine.java
View file

This file was deleted.

0 comments on commit cadd9ce

Please sign in to comment.