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

Commit

Permalink
fixed some issues where IV tiers were not used where nessecary
Browse files Browse the repository at this point in the history
  • Loading branch information
@Trinsdar
Trinsdar committed Sep 16, 2024
1 parent c4d8818 commit b296c2a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
10 changes: 5 additions & 5 deletions common/src/main/java/muramasa/gregtech/data/GregTechCovers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
public class GregTechCovers {
public static final CoverFactory COVER_CONVEYOR = CoverFactory.builder(CoverConveyor::new).gui().item((a, b) ->
new ItemCover(a.getDomain(), a.getId(), b).tip(String.format("1 Stack every %dt(%ss) (as Cover)", CoverConveyor.speeds.get(b), (float)CoverConveyor.speeds.get(b) / 20))
).addTextures(new Texture(GTIRef.ID, "block/cover/conveyor")).setTiers(Tier.getStandard()).build(GTIRef.ID, "conveyor");
).addTextures(new Texture(GTIRef.ID, "block/cover/conveyor")).setTiers(Tier.getStandardWithIV()).build(GTIRef.ID, "conveyor");
public static final CoverFactory COVER_ITEM_REGULATOR = CoverFactory.builder(CoverItemRegulator::new).gui().item((a, b) ->
new ItemCover(a.getDomain(), a.getId(), b).tip(String.format("1 Stack every %dt(%ss), with configurable stack size limits (as Cover)", CoverConveyor.speeds.get(b), (float)CoverConveyor.speeds.get(b) / 20))
).addTextures(new Texture(GTIRef.ID, "block/cover/conveyor")).setTiers(Tier.getStandard()).build(GTIRef.ID, "item_regulator");
).addTextures(new Texture(GTIRef.ID, "block/cover/conveyor")).setTiers(Tier.getStandardWithIV()).build(GTIRef.ID, "item_regulator");
public static final CoverFactory COVER_ITEM_RETRIEVER = CoverFactory.builder(CoverItemRetriever::new).item((a, b) -> {
return new ItemCoverCustomTooltip(GTIRef.ID, "item_retriever", (stack, world, tooltip, flag) -> {
CompoundTag nbt = stack.getTag();
Expand All @@ -47,13 +47,13 @@ public class GregTechCovers {
}).addTextures(new Texture(GTIRef.ID, "block/cover/item_retriever")).setIsValid(b -> b instanceof BlockEntityItemPipe<?>).gui().build(GTIRef.ID, "item_retriever");
public static final CoverFactory COVER_PUMP = CoverFactory.builder(CoverPump::new).gui().item((a, b) ->
new ItemCover(a.getDomain(), a.getId(), b).tip(String.format("%d L/t (as Cover)", CoverPump.speeds.get(b))))
.addTextures(new Texture(GTIRef.ID, "block/cover/pump")).setTiers(Tier.getStandard()).build(GTIRef.ID, "pump");
.addTextures(new Texture(GTIRef.ID, "block/cover/pump")).setTiers(Tier.getStandardWithIV()).build(GTIRef.ID, "pump");
public static final CoverFactory COVER_FLUID_REGULATOR = CoverFactory.builder(CoverFluidRegulator::new).gui().item((a, b) ->
new ItemCover(a.getDomain(), a.getId(), b).tip(String.format("Configurable up to %d L/t (as Cover)", CoverPump.speeds.get(b))))
.addTextures(new Texture(GTIRef.ID, "block/cover/pump")).setTiers(Tier.getStandard()).build(GTIRef.ID, "fluid_regulator");
.addTextures(new Texture(GTIRef.ID, "block/cover/pump")).setTiers(Tier.getStandardWithIV()).build(GTIRef.ID, "fluid_regulator");
public static final CoverFactory COVER_ROBOT_ARM = CoverFactory.builder(CoverRobotArm::new).gui().item((a, b) ->
new ItemCover(a.getDomain(), a.getId(), b).tip(String.format("1 Stack every %dt(%ss) (as Cover)", CoverConveyor.speeds.get(b), (float)CoverConveyor.speeds.get(b) / 20)))
.addTextures(new Texture(GTIRef.ID, "block/cover/conveyor")).setTiers(Tier.getStandard()).build(GTIRef.ID, "robot_arm");
.addTextures(new Texture(GTIRef.ID, "block/cover/conveyor")).setTiers(Tier.getStandardWithIV()).build(GTIRef.ID, "robot_arm");
public static final CoverFactory COVER_DRAIN = CoverFactory.builder(CoverDrain::new).item((a, b) ->
new ItemCover(GTIRef.ID, "drain").tip("Can be placed on machines/pipes as a cover")).addTextures(new Texture(GTIRef.ID, "block/cover/drain")).build(GTIRef.ID, "drain");
public static final CoverFactory COVER_AIR_VENT = CoverFactory.builder(CoverAirVent::new).item((a, b) ->
Expand Down
8 changes: 4 additions & 4 deletions common/src/main/java/muramasa/gregtech/data/Machines.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ public class Machines {
/**
* Filters
**/
public static BasicMachine ELECTRIC_ITEM_FILTER = new BasicMachine(GTIRef.ID, "electric_item_filter").addFlags(GUI, EU, ITEM).setTile(BlockEntityItemFilter::new).noCovers().frontCovers().allowFrontIO().setVerticalFacingAllowed(true).overlayTexture(Textures.LEFT_RIGHT_HANDLER);
public static BasicMachine ELECTRIC_TYPE_FILTER = new BasicMachine(GTIRef.ID, "electric_type_filter").addFlags(GUI, EU, ITEM).setTile(BlockEntityTypeFilter::new).noCovers().frontCovers().allowFrontIO().setVerticalFacingAllowed(true).overlayTexture(Textures.LEFT_RIGHT_HANDLER);
public static BasicMachine SUPER_BUFFER =new BasicMachine(GTIRef.ID, "super_buffer").addFlags(GUI, EU, ITEM).setTile(BlockEntityBuffer::new).setVerticalFacingAllowed(true).allowFrontIO().noCovers().frontCovers().overlayTexture(Textures.LEFT_RIGHT_HANDLER);
public static BasicMachine CHEST_BUFFER =new BasicMachine(GTIRef.ID, "chest_buffer").addFlags(GUI, EU, ITEM).setTile(BlockEntityBuffer::new).setVerticalFacingAllowed(true).allowFrontIO().noCovers().frontCovers().overlayTexture(Textures.LEFT_RIGHT_HANDLER);
public static BasicMachine ELECTRIC_ITEM_FILTER = new BasicMachine(GTIRef.ID, "electric_item_filter").setTiers(Tier.getStandardWithIV()).addFlags(GUI, EU, ITEM).setTile(BlockEntityItemFilter::new).noCovers().frontCovers().allowFrontIO().setVerticalFacingAllowed(true).overlayTexture(Textures.LEFT_RIGHT_HANDLER);
public static BasicMachine ELECTRIC_TYPE_FILTER = new BasicMachine(GTIRef.ID, "electric_type_filter").setTiers(Tier.getStandardWithIV()).addFlags(GUI, EU, ITEM).setTile(BlockEntityTypeFilter::new).noCovers().frontCovers().allowFrontIO().setVerticalFacingAllowed(true).overlayTexture(Textures.LEFT_RIGHT_HANDLER);
public static BasicMachine SUPER_BUFFER =new BasicMachine(GTIRef.ID, "super_buffer").setTiers(Tier.getStandardWithIV()).addFlags(GUI, EU, ITEM).setTile(BlockEntityBuffer::new).setVerticalFacingAllowed(true).allowFrontIO().noCovers().frontCovers().overlayTexture(Textures.LEFT_RIGHT_HANDLER);
public static BasicMachine CHEST_BUFFER =new BasicMachine(GTIRef.ID, "chest_buffer").setTiers(Tier.getStandardWithIV()).addFlags(GUI, EU, ITEM).setTile(BlockEntityBuffer::new).setVerticalFacingAllowed(true).allowFrontIO().noCovers().frontCovers().overlayTexture(Textures.LEFT_RIGHT_HANDLER);
/**
* Drums
*/
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/muramasa/gregtech/loader/crafting/MachineRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ private static void addMultiblockRecipes(Consumer<FinishedRecipe> output, Antima
.put('W', GregTechBlocks.TITANIUM_WALL)
.put('C', TIER_CIRCUITS.apply(IV))
.put('c', TIER_CIRCUITS.apply(EV)).build(), "GGG", "RWR", "cCc"));
Arrays.stream(getStandard()).filter(t -> t !=IV).forEach(tier -> {
Arrays.stream(getStandard()).forEach(tier -> {
Block firebox = tier == LV ? GregTechBlocks.CASING_FIREBOX_BRONZE : tier == MV ? GregTechBlocks.CASING_FIREBOX_STEEL : tier == HV ? GregTechBlocks.CASING_FIREBOX_TITANIUM : GregTechBlocks.CASING_FIREBOX_TUNGSTENSTEEL;
Tier circuitTier = tier == LV ? tier : tier == MV ? HV : tier == HV ? EV : IV;
add(LARGE_BOILER, tier, (m,item) -> provider.addItemRecipe(output, "machines", item,
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public static void loadRecipes(Consumer<FinishedRecipe> output, AntimatterRecipe
}

private static void tieredItems(Consumer<FinishedRecipe> output, AntimatterRecipeProvider provider){
Arrays.stream(Tier.getStandard()).forEach(t -> {
Arrays.stream(Tier.getStandardWithIV()).forEach(t -> {
Material magnet = (t == Tier.ULV || t == LV) ? IronMagnetic
: (t == Tier.EV || t == Tier.IV ? NeodymiumMagnetic : SteelMagnetic);
Object cable = CABLE_GETTER.apply(PipeSize.VTINY, t, false);
Expand Down
6 changes: 3 additions & 3 deletions common/src/main/java/muramasa/gregtech/loader/machines/AssemblerLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ private static void addCoverRecipe(ItemStack cover, Ingredient... inputs){
}

private static void motors(){
Arrays.stream(Tier.getStandard()).forEach(t -> {
Arrays.stream(Tier.getStandardWithIV()).forEach(t -> {
Material magnet = (t == Tier.ULV || t == Tier.LV) ? IronMagnetic : (t == Tier.EV || t == Tier.IV ? NeodymiumMagnetic : SteelMagnetic);
ASSEMBLER.RB().ii(ofObject(WIRE_GETTER.apply(fromTier(t), LV),4), of(ROD.get(TIER_MATERIALS.get(t)),2),
of(ROD.get(magnet),1)
Expand All @@ -215,7 +215,7 @@ private static void motors(){
}

private static void pistons(){
Arrays.stream(Tier.getStandard()).forEach(t -> {
Arrays.stream(Tier.getStandardWithIV()).forEach(t -> {
ASSEMBLER.RB().ii(ofObject(CABLE_GETTER.apply(PipeSize.VTINY, t, false),2),
of(ROD.get(TIER_MATERIALS.get(t)),2),
of(PLATE.get(TIER_MATERIALS.get(t)),3),
Expand All @@ -226,7 +226,7 @@ private static void pistons(){
});
}
private static void pumps(){
Arrays.stream(Tier.getStandard()).forEach(t -> {
Arrays.stream(Tier.getStandardWithIV()).forEach(t -> {
ASSEMBLER.RB().ii(ofObject(CABLE_GETTER.apply(PipeSize.VTINY, t, false),1),
SCREW.getMaterialIngredient(TIER_ROTORS.get(t), 1),
ROTOR.getMaterialIngredient(TIER_ROTORS.get(t), 1),
Expand Down

0 comments on commit b296c2a

Please sign in to comment.