diff --git a/build.gradle b/build.gradle index 3085108..33bf72c 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ apply plugin: 'eclipse' apply plugin: 'maven-publish' apply plugin: 'org.spongepowered.mixin' -version = '1.16.5-0.1.48-B' + getVersionNumber() +version = '1.16.5-0.1.50-B' + getVersionNumber() group = 'com.ticticboooom.mods.mm' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'MasterfulMachinery' java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8. @@ -179,7 +179,6 @@ dependencies { compileOnly 'com.google.code.gson:gson:2.8.7' implementation 'org.spongepowered:mixin:0.8-SNAPSHOT' annotationProcessor 'org.spongepowered:mixin:0.8.2:processor' - shade 'com.github.marschall:memoryfilesystem:2.1.0' implementation fg.deobf("mekanism:Mekanism:${mekanism_version}")// core runtimeOnly fg.deobf("mekanism:Mekanism:${mekanism_version}:additions")// Mekanism: Additions diff --git a/src/main/java/com/ticticboooom/mods/mm/MM.java b/src/main/java/com/ticticboooom/mods/mm/MM.java index 7bb8e46..a3dc23d 100644 --- a/src/main/java/com/ticticboooom/mods/mm/MM.java +++ b/src/main/java/com/ticticboooom/mods/mm/MM.java @@ -7,13 +7,12 @@ import com.ticticboooom.mods.mm.block.ControllerBlock; import com.ticticboooom.mods.mm.block.MachinePortBlock; import com.ticticboooom.mods.mm.block.container.ControllerBlockContainer; import com.ticticboooom.mods.mm.block.container.PortBlockContainer; -import com.ticticboooom.mods.mm.block.tile.StructureGenBlockEntity; import com.ticticboooom.mods.mm.client.screen.ControllerBlockContainerScreen; import com.ticticboooom.mods.mm.client.screen.PortBlockContainerScreen; import com.ticticboooom.mods.mm.client.screen.StructureGenBlockContainerScreen; import com.ticticboooom.mods.mm.client.ter.StructureGenTileEntityRenderer; import com.ticticboooom.mods.mm.datagen.MMPackFinder; -import com.ticticboooom.mods.mm.datagen.MemoryDataGeneratorFactory; +import com.ticticboooom.mods.mm.datagen.DataGeneratorFactory; import com.ticticboooom.mods.mm.datagen.PackType; import com.ticticboooom.mods.mm.datagen.gen.MMBlockStateProvider; import com.ticticboooom.mods.mm.datagen.gen.MMItemModelProvider; @@ -28,7 +27,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScreenManager; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderTypeLookup; -import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.data.DataGenerator; import net.minecraft.inventory.container.ContainerType; import net.minecraft.resources.ResourcePackList; @@ -40,7 +38,6 @@ import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.RegistryObject; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.thread.EffectiveSide; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; @@ -64,7 +61,7 @@ public class MM { instance = this; MMPorts.init(); MMLoader.load(); - MemoryDataGeneratorFactory.init(); + DataGeneratorFactory.init(); PacketHandler.init(); registerDataGen(); IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus(); @@ -81,7 +78,7 @@ public class MM { } private void registerDataGen() { - generator = MemoryDataGeneratorFactory.createMemoryDataGenerator(); + generator = DataGeneratorFactory.createMemoryDataGenerator(); ExistingFileHelper existingFileHelper = new ExistingFileHelper(ImmutableList.of(), ImmutableSet.of(), false); generator.addProvider(new MMLootTableProvider(generator)); diff --git a/src/main/java/com/ticticboooom/mods/mm/block/tile/AstralMachineInputPortBlockEntity.java b/src/main/java/com/ticticboooom/mods/mm/block/tile/AstralMachineInputPortBlockEntity.java index e178ab5..6090846 100644 --- a/src/main/java/com/ticticboooom/mods/mm/block/tile/AstralMachineInputPortBlockEntity.java +++ b/src/main/java/com/ticticboooom/mods/mm/block/tile/AstralMachineInputPortBlockEntity.java @@ -62,7 +62,7 @@ public class AstralMachineInputPortBlockEntity extends TileReceiverBase ter = null; private TileEntity tile; - private static final IBlockReader reader = new AirBlockReader(); public GuiBlockRenderBuilder(BlockState blockState) { this.blockState = blockState; position = new BlockPos(0, 0, 0); try { - tile = blockState.createTileEntity(reader); + AirBlockReader airBlockReader = new AirBlockReader(blockState); + tile = blockState.createTileEntity(airBlockReader); + airBlockReader.setTile(tile); if (tile != null) { ter = TileEntityRendererDispatcher.instance.getRenderer(tile); } - } catch (Exception ignored) {} + } catch (Exception ignored) { + } } public GuiBlockRenderBuilder at(BlockPos position) { @@ -93,13 +95,16 @@ public class GuiBlockRenderBuilder { transformMatrix(ms); brd.renderBlock(blockState, ms, buf, 0xF000F0, OverlayTexture.NO_OVERLAY, EmptyModelData.INSTANCE); + ms.push(); try { if (ter != null) { ter.render(tile, 1.f, ms, buf, 0xF000F0, OverlayTexture.NO_OVERLAY); } - } catch (Exception ignored) {} + } catch (Exception ignored) { + } buf.finish(); ms.pop(); + ms.pop(); cleanupRender(); } @@ -111,5 +116,8 @@ public class GuiBlockRenderBuilder { } ms.scale(scale.getX(), -scale.getY(), scale.getZ()); ms.translate(position.getX(), position.getY(), position.getZ()); + if (tile != null) { + tile.setPos(new BlockPos(0, 0, 0)); + } } } diff --git a/src/main/java/com/ticticboooom/mods/mm/core/MMPortRegistrationEvent.java b/src/main/java/com/ticticboooom/mods/mm/core/MMPortRegistrationEvent.java new file mode 100644 index 0000000..7b8facb --- /dev/null +++ b/src/main/java/com/ticticboooom/mods/mm/core/MMPortRegistrationEvent.java @@ -0,0 +1,19 @@ +package com.ticticboooom.mods.mm.core; + +import com.ticticboooom.mods.mm.ports.MasterfulPortType; +import lombok.Getter; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.eventbus.api.Event; +import net.minecraftforge.fml.event.lifecycle.IModBusEvent; + +import java.util.Map; + +public class MMPortRegistrationEvent extends Event { + @Getter + private Map portsMap; + + public MMPortRegistrationEvent(Map portsMap) { + + this.portsMap = portsMap; + } +} diff --git a/src/main/java/com/ticticboooom/mods/mm/datagen/MemoryDataGeneratorFactory.java b/src/main/java/com/ticticboooom/mods/mm/datagen/DataGeneratorFactory.java similarity index 68% rename from src/main/java/com/ticticboooom/mods/mm/datagen/MemoryDataGeneratorFactory.java rename to src/main/java/com/ticticboooom/mods/mm/datagen/DataGeneratorFactory.java index be871b9..0de4504 100644 --- a/src/main/java/com/ticticboooom/mods/mm/datagen/MemoryDataGeneratorFactory.java +++ b/src/main/java/com/ticticboooom/mods/mm/datagen/DataGeneratorFactory.java @@ -24,27 +24,21 @@ package com.ticticboooom.mods.mm.datagen; -import com.github.marschall.memoryfilesystem.MemoryFileSystemBuilder; import com.google.common.collect.ImmutableList; import net.minecraft.data.DataGenerator; +import net.minecraftforge.fml.loading.FMLPaths; -import java.io.IOException; -import java.nio.file.FileSystem; import java.nio.file.Path; -public class MemoryDataGeneratorFactory { - public static Path ROOT_PATH; +public class DataGeneratorFactory { - public static void init() { - try { - FileSystem fs = MemoryFileSystemBuilder.newEmpty().addRoot("/").setCurrentWorkingDirectory("/mm").setCaseSensitive(true).build(); - ROOT_PATH = fs.getPath("/mm"); - } catch (IOException e) { - e.printStackTrace(); + public static Path ROOT_PATH; + + public static void init() { + ROOT_PATH = FMLPaths.CONFIGDIR.get().resolve("masterful_machinery/packs"); } - } - public static DataGenerator createMemoryDataGenerator() { - return new DataGenerator(ROOT_PATH, ImmutableList.of()); - } + public static DataGenerator createMemoryDataGenerator() { + return new DataGenerator(ROOT_PATH, ImmutableList.of()); + } } diff --git a/src/main/java/com/ticticboooom/mods/mm/datagen/MMPackFinder.java b/src/main/java/com/ticticboooom/mods/mm/datagen/MMPackFinder.java index a953c86..5b35f4e 100644 --- a/src/main/java/com/ticticboooom/mods/mm/datagen/MMPackFinder.java +++ b/src/main/java/com/ticticboooom/mods/mm/datagen/MMPackFinder.java @@ -44,7 +44,7 @@ public class MMPackFinder implements IPackFinder { @Override public void findPacks(Consumer infoConsumer, ResourcePackInfo.IFactory infoFactory) { - Path rootPath = MemoryDataGeneratorFactory.ROOT_PATH; + Path rootPath = DataGeneratorFactory.ROOT_PATH; ResourcePackInfo pack = ResourcePackInfo.createResourcePack("mm_" + type.getSuffix(), true, () -> new InMemoryPack(rootPath), infoFactory, ResourcePackInfo.Priority.BOTTOM, IPackNameDecorator.PLAIN); diff --git a/src/main/java/com/ticticboooom/mods/mm/helper/StructureHelper.java b/src/main/java/com/ticticboooom/mods/mm/helper/StructureHelper.java index 24d3ed7..aad8707 100644 --- a/src/main/java/com/ticticboooom/mods/mm/helper/StructureHelper.java +++ b/src/main/java/com/ticticboooom/mods/mm/helper/StructureHelper.java @@ -69,6 +69,10 @@ public class StructureHelper { BlockState state = world.getBlockState(new BlockPos(xi, yi, zi)); ResourceLocation registryName = state.getBlock().getRegistryName(); + if (index == 'C'){ + index++; + } + if (state.isAir()) { row.append(" "); continue; diff --git a/src/main/java/com/ticticboooom/mods/mm/inventory/mek/MekChemicalInventory.java b/src/main/java/com/ticticboooom/mods/mm/inventory/mek/MekChemicalInventory.java index afecaa1..c15d179 100644 --- a/src/main/java/com/ticticboooom/mods/mm/inventory/mek/MekChemicalInventory.java +++ b/src/main/java/com/ticticboooom/mods/mm/inventory/mek/MekChemicalInventory.java @@ -66,7 +66,7 @@ public class MekChemicalInventory, STACK ext if (this.stack.getAmount() + stack.getAmount() > capacity) { return factory.apply(stack.getType(), (this.stack.getAmount() + stack.getAmount() - capacity)); } else { - return empty; + return this.empty; } } @@ -84,7 +84,7 @@ public class MekChemicalInventory, STACK ext } else { this.stack.setAmount(this.stack.getAmount() + stack.getAmount()); } - return empty; + return this.empty; } } @@ -92,7 +92,7 @@ public class MekChemicalInventory, STACK ext public STACK extractChemical(int i, long l, Action action) { if (action.simulate()) { if (stack.getAmount() - l < 0) { - return factory.apply(stack.getType(), l - (l + stack.getAmount())); + return factory.apply(stack.getType(), l - (l - stack.getAmount())); } else { return factory.apply(stack.getType(), l); } @@ -101,7 +101,7 @@ public class MekChemicalInventory, STACK ext if (stack.getAmount() - l < 0) { long preAmount = stack.getAmount(); this.stack = empty; - return factory.apply(stack.getType(),l - (preAmount - l)); + return factory.apply(stack.getType(),l - (l - preAmount)); } else { stack.setAmount(stack.getAmount() - l); return factory.apply(stack.getType(), l); diff --git a/src/main/java/com/ticticboooom/mods/mm/inventory/mek/PortMekGasInventory.java b/src/main/java/com/ticticboooom/mods/mm/inventory/mek/PortMekGasInventory.java index 3394733..8ebd558 100644 --- a/src/main/java/com/ticticboooom/mods/mm/inventory/mek/PortMekGasInventory.java +++ b/src/main/java/com/ticticboooom/mods/mm/inventory/mek/PortMekGasInventory.java @@ -2,8 +2,9 @@ package com.ticticboooom.mods.mm.inventory.mek; import mekanism.api.chemical.gas.Gas; import mekanism.api.chemical.gas.GasStack; +import mekanism.api.chemical.gas.IGasHandler; -public class PortMekGasInventory extends MekChemicalInventory { +public class PortMekGasInventory extends MekChemicalInventory implements IGasHandler { public PortMekGasInventory(long capacity) { super(GasStack.EMPTY, capacity, GasStack::new); diff --git a/src/main/java/com/ticticboooom/mods/mm/inventory/mek/PortMekInfuseInventory.java b/src/main/java/com/ticticboooom/mods/mm/inventory/mek/PortMekInfuseInventory.java index 6766d15..a677646 100644 --- a/src/main/java/com/ticticboooom/mods/mm/inventory/mek/PortMekInfuseInventory.java +++ b/src/main/java/com/ticticboooom/mods/mm/inventory/mek/PortMekInfuseInventory.java @@ -1,9 +1,10 @@ package com.ticticboooom.mods.mm.inventory.mek; +import mekanism.api.chemical.infuse.IInfusionHandler; import mekanism.api.chemical.infuse.InfuseType; import mekanism.api.chemical.infuse.InfusionStack; -public class PortMekInfuseInventory extends MekChemicalInventory { +public class PortMekInfuseInventory extends MekChemicalInventory implements IInfusionHandler { public PortMekInfuseInventory(long capacity) { super(InfusionStack.EMPTY, capacity, InfusionStack::new); diff --git a/src/main/java/com/ticticboooom/mods/mm/inventory/mek/PortMekSlurryInventory.java b/src/main/java/com/ticticboooom/mods/mm/inventory/mek/PortMekSlurryInventory.java index e41a447..2414f83 100644 --- a/src/main/java/com/ticticboooom/mods/mm/inventory/mek/PortMekSlurryInventory.java +++ b/src/main/java/com/ticticboooom/mods/mm/inventory/mek/PortMekSlurryInventory.java @@ -1,17 +1,11 @@ package com.ticticboooom.mods.mm.inventory.mek; -import mekanism.api.Action; -import mekanism.api.chemical.gas.GasStack; -import mekanism.api.chemical.gas.IGasHandler; -import mekanism.api.chemical.gas.IGasTank; import mekanism.api.chemical.slurry.ISlurryHandler; import mekanism.api.chemical.slurry.ISlurryTank; import mekanism.api.chemical.slurry.Slurry; import mekanism.api.chemical.slurry.SlurryStack; -import java.util.function.BiFunction; - -public class PortMekSlurryInventory extends MekChemicalInventory { +public class PortMekSlurryInventory extends MekChemicalInventory implements ISlurryHandler, ISlurryTank { public PortMekSlurryInventory(long capacity) { super(SlurryStack.EMPTY, capacity, SlurryStack::new); } diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/parser/MekInfusePortParser.java b/src/main/java/com/ticticboooom/mods/mm/ports/parser/MekInfusePortParser.java index cecba80..ad44d13 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/parser/MekInfusePortParser.java +++ b/src/main/java/com/ticticboooom/mods/mm/ports/parser/MekInfusePortParser.java @@ -13,6 +13,7 @@ import com.ticticboooom.mods.mm.ports.storage.MekInfusePortStorage; import com.ticticboooom.mods.mm.ports.storage.MekSlurryPortStorage; import com.ticticboooom.mods.mm.ports.storage.PortStorage; import lombok.SneakyThrows; +import mekanism.api.chemical.infuse.InfusionStack; import mekanism.api.chemical.slurry.SlurryStack; import mekanism.client.jei.MekanismJEI; import mezz.jei.api.ingredients.IIngredients; @@ -27,9 +28,9 @@ public class MekInfusePortParser extends PortFactory { @Override public void setIngredients(IIngredients ingredients, List stacks, boolean input) { if (input) { - ingredients.setInputs(MekanismJEI.TYPE_SLURRY, (List)stacks); + ingredients.setInputs(MekanismJEI.TYPE_INFUSION, (List)stacks); } else { - ingredients.setOutputs(MekanismJEI.TYPE_SLURRY, (List)stacks); + ingredients.setOutputs(MekanismJEI.TYPE_INFUSION, (List)stacks); } } diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/parser/PneumaticPortParser.java b/src/main/java/com/ticticboooom/mods/mm/ports/parser/PneumaticPortParser.java index 3ef952e..0ccad4f 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/parser/PneumaticPortParser.java +++ b/src/main/java/com/ticticboooom/mods/mm/ports/parser/PneumaticPortParser.java @@ -6,7 +6,7 @@ import com.mojang.datafixers.util.Pair; import com.mojang.serialization.DataResult; import com.mojang.serialization.JsonOps; import com.ticticboooom.mods.mm.MM; -import com.ticticboooom.mods.mm.client.jei.category.MMJeiPlugin; +import com.ticticboooom.mods.mm.client.jei.MMJeiPlugin; import com.ticticboooom.mods.mm.client.jei.ingredients.model.PressureStack; import com.ticticboooom.mods.mm.ports.state.PneumaticPortState; import com.ticticboooom.mods.mm.ports.state.PortState; diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/state/EnergyPortState.java b/src/main/java/com/ticticboooom/mods/mm/ports/state/EnergyPortState.java index 91182e7..a0ad26a 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/state/EnergyPortState.java +++ b/src/main/java/com/ticticboooom/mods/mm/ports/state/EnergyPortState.java @@ -4,23 +4,19 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import com.ticticboooom.mods.mm.MM; -import com.ticticboooom.mods.mm.client.jei.category.MMJeiPlugin; +import com.ticticboooom.mods.mm.client.jei.MMJeiPlugin; import com.ticticboooom.mods.mm.client.jei.ingredients.model.EnergyStack; import com.ticticboooom.mods.mm.ports.storage.EnergyPortStorage; import com.ticticboooom.mods.mm.ports.storage.PortStorage; import lombok.Getter; -import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.drawable.IDrawableStatic; import mezz.jei.api.gui.ingredient.IGuiIngredientGroup; import mezz.jei.api.helpers.IJeiHelpers; import mezz.jei.api.ingredients.IIngredientType; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.AbstractGui; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.StringTextComponent; -import java.text.NumberFormat; import java.util.List; public class EnergyPortState extends PortState { diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/state/ManaPortState.java b/src/main/java/com/ticticboooom/mods/mm/ports/state/ManaPortState.java index 882966c..170b114 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/state/ManaPortState.java +++ b/src/main/java/com/ticticboooom/mods/mm/ports/state/ManaPortState.java @@ -4,10 +4,8 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import com.ticticboooom.mods.mm.MM; -import com.ticticboooom.mods.mm.client.jei.category.MMJeiPlugin; -import com.ticticboooom.mods.mm.client.jei.ingredients.model.EnergyStack; +import com.ticticboooom.mods.mm.client.jei.MMJeiPlugin; import com.ticticboooom.mods.mm.inventory.botania.PortManaInventory; -import com.ticticboooom.mods.mm.ports.storage.EnergyPortStorage; import com.ticticboooom.mods.mm.ports.storage.ManaPortStorage; import com.ticticboooom.mods.mm.ports.storage.PortStorage; import lombok.Getter; @@ -18,7 +16,6 @@ import mezz.jei.api.helpers.IJeiHelpers; import mezz.jei.api.ingredients.IIngredientType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.StringTextComponent; -import vazkii.botania.api.mana.IManaReceiver; import java.util.List; diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/state/MekInfusePortState.java b/src/main/java/com/ticticboooom/mods/mm/ports/state/MekInfusePortState.java index df3d5f1..612c355 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/state/MekInfusePortState.java +++ b/src/main/java/com/ticticboooom/mods/mm/ports/state/MekInfusePortState.java @@ -86,7 +86,7 @@ public class MekInfusePortState extends PortState { if (st instanceof MekInfusePortStorage) { MekInfusePortStorage gasStorage = (MekInfusePortStorage) st; InfusionStack extract = gasStorage.getInv().insertChemical(new InfusionStack(Objects.requireNonNull(MekanismAPI.infuseTypeRegistry().getValue(RLUtils.toRL(infuse))), current), Action.EXECUTE); - current -= extract.getAmount(); + current -= current - extract.getAmount(); if (current <= 0) { return; } @@ -101,7 +101,7 @@ public class MekInfusePortState extends PortState { if (st instanceof MekInfusePortStorage) { MekInfusePortStorage gasStorage = (MekInfusePortStorage) st; InfusionStack extract = gasStorage.getInv().insertChemical(new InfusionStack(Objects.requireNonNull(MekanismAPI.infuseTypeRegistry().getValue(RLUtils.toRL(infuse))), current), Action.SIMULATE); - current -= extract.getAmount(); + current -= current - extract.getAmount(); if (current <= 0) { return true; } @@ -119,15 +119,15 @@ public class MekInfusePortState extends PortState { @Override public void validateDefinition() { if (!RLUtils.isRL(infuse)){ - throw new InvalidProcessDefinitionException("Slurry: " + infuse + " is not a valid slurry id (ResourceLocation)"); + throw new InvalidProcessDefinitionException("Infuse Type: " + infuse + " is not a valid infuse type id (ResourceLocation)"); } - if (!MekanismAPI.slurryRegistry().containsKey(RLUtils.toRL(infuse))){ - throw new InvalidProcessDefinitionException("Slurry: " + infuse + " does not exist in the mekansim slurry registry"); + if (!MekanismAPI.infuseTypeRegistry().containsKey(RLUtils.toRL(infuse))){ + throw new InvalidProcessDefinitionException("Infuse Type: " + infuse + " does not exist in the mekansim infuse type registry"); } } - private final ChemicalStackRenderer renderer; + private final ChemicalStackRenderer renderer; @Override public void render(MatrixStack ms, int x, int y, int mouseX, int mouseY, IJeiHelpers helpers) { IDrawableStatic drawable = helpers.getGuiHelper().getSlotDrawable(); @@ -136,9 +136,9 @@ public class MekInfusePortState extends PortState { @Override public void setupRecipe(IRecipeLayout layout, Integer typeIndex, int x, int y, boolean input) { - IGuiIngredientGroup gasGroup = layout.getIngredientsGroup(MekanismJEI.TYPE_SLURRY); + IGuiIngredientGroup gasGroup = layout.getIngredientsGroup(MekanismJEI.TYPE_INFUSION); gasGroup.init(typeIndex, input, renderer, x + 1, y + 1, 16, 16, 0, 0); - gasGroup.set(typeIndex, new SlurryStack(MekanismAPI.slurryRegistry().getValue(RLUtils.toRL(infuse)), amount)); + gasGroup.set(typeIndex, new InfusionStack(MekanismAPI.infuseTypeRegistry().getValue(RLUtils.toRL(infuse)), amount)); if (this.getChance() < 1) { gasGroup.addTooltipCallback((s, a, b, c) -> { if (s == typeIndex) { @@ -155,6 +155,6 @@ public class MekInfusePortState extends PortState { @Override public IIngredientType getJeiIngredientType() { - return MekanismJEI.TYPE_SLURRY; + return MekanismJEI.TYPE_INFUSION; } } diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/state/MekSlurryPortState.java b/src/main/java/com/ticticboooom/mods/mm/ports/state/MekSlurryPortState.java index ad5e839..b27901f 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/state/MekSlurryPortState.java +++ b/src/main/java/com/ticticboooom/mods/mm/ports/state/MekSlurryPortState.java @@ -86,7 +86,7 @@ public class MekSlurryPortState extends PortState { if (st instanceof MekSlurryPortStorage) { MekSlurryPortStorage gasStorage = (MekSlurryPortStorage) st; SlurryStack extract = gasStorage.getInv().insertChemical(new SlurryStack(Objects.requireNonNull(MekanismAPI.slurryRegistry().getValue(RLUtils.toRL(slurry))), current), Action.EXECUTE); - current -= extract.getAmount(); + current -= current - extract.getAmount(); if (current <= 0) { return; } @@ -101,7 +101,7 @@ public class MekSlurryPortState extends PortState { if (st instanceof MekSlurryPortStorage) { MekSlurryPortStorage gasStorage = (MekSlurryPortStorage) st; SlurryStack extract = gasStorage.getInv().insertChemical(new SlurryStack(Objects.requireNonNull(MekanismAPI.slurryRegistry().getValue(RLUtils.toRL(slurry))), current), Action.SIMULATE); - current -= extract.getAmount(); + current -= current - extract.getAmount(); if (current <= 0) { return true; } diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/state/PneumaticPortState.java b/src/main/java/com/ticticboooom/mods/mm/ports/state/PneumaticPortState.java index 8b2deba..d919efe 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/state/PneumaticPortState.java +++ b/src/main/java/com/ticticboooom/mods/mm/ports/state/PneumaticPortState.java @@ -5,7 +5,7 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import com.ticticboooom.mods.mm.MM; -import com.ticticboooom.mods.mm.client.jei.category.MMJeiPlugin; +import com.ticticboooom.mods.mm.client.jei.MMJeiPlugin; import com.ticticboooom.mods.mm.client.jei.ingredients.model.PressureStack; import com.ticticboooom.mods.mm.ports.storage.PneumaticPortStorage; import com.ticticboooom.mods.mm.ports.storage.PortStorage; @@ -15,7 +15,6 @@ import mezz.jei.api.gui.ingredient.IGuiIngredientGroup; import mezz.jei.api.helpers.IJeiHelpers; import mezz.jei.api.ingredients.IIngredientType; import net.minecraft.util.ResourceLocation; -import org.lwjgl.system.CallbackI; import java.util.List; diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/state/RotationPortState.java b/src/main/java/com/ticticboooom/mods/mm/ports/state/RotationPortState.java index 35cae0b..c698aa0 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/state/RotationPortState.java +++ b/src/main/java/com/ticticboooom/mods/mm/ports/state/RotationPortState.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import com.ticticboooom.mods.mm.MM; -import com.ticticboooom.mods.mm.client.jei.category.MMJeiPlugin; +import com.ticticboooom.mods.mm.client.jei.MMJeiPlugin; import com.ticticboooom.mods.mm.ports.storage.PortStorage; import com.ticticboooom.mods.mm.ports.storage.RotationPortStorage; import mezz.jei.api.gui.IRecipeLayout; diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/state/StarlightPortState.java b/src/main/java/com/ticticboooom/mods/mm/ports/state/StarlightPortState.java index 341e952..0416426 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/state/StarlightPortState.java +++ b/src/main/java/com/ticticboooom/mods/mm/ports/state/StarlightPortState.java @@ -4,26 +4,19 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import com.ticticboooom.mods.mm.MM; -import com.ticticboooom.mods.mm.client.jei.category.MMJeiPlugin; -import com.ticticboooom.mods.mm.client.jei.ingredients.model.PressureStack; +import com.ticticboooom.mods.mm.client.jei.MMJeiPlugin; import com.ticticboooom.mods.mm.client.jei.ingredients.model.StarlightStack; import com.ticticboooom.mods.mm.ports.storage.StarlightPortStorage; import com.ticticboooom.mods.mm.ports.storage.PortStorage; -import com.ticticboooom.mods.mm.ports.storage.StarlightPortStorage; -import hellfirepvp.astralsorcery.common.block.base.BlockStarlightRecipient; -import hellfirepvp.astralsorcery.common.constellation.IWeakConstellation; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.drawable.IDrawableStatic; import mezz.jei.api.gui.ingredient.IGuiIngredientGroup; import mezz.jei.api.helpers.IJeiHelpers; import mezz.jei.api.ingredients.IIngredientType; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; import java.util.ArrayList; import java.util.List; -import java.util.Random; public class StarlightPortState extends PortState { public static final Codec CODEC = RecordCodecBuilder.create(x -> x.group( diff --git a/src/main/java/com/ticticboooom/mods/mm/ports/storage/MekInfusePortStorage.java b/src/main/java/com/ticticboooom/mods/mm/ports/storage/MekInfusePortStorage.java index 5c83eb2..aacc5c2 100644 --- a/src/main/java/com/ticticboooom/mods/mm/ports/storage/MekInfusePortStorage.java +++ b/src/main/java/com/ticticboooom/mods/mm/ports/storage/MekInfusePortStorage.java @@ -46,7 +46,7 @@ public class MekInfusePortStorage extends PortStorage { @Override public boolean validate(Capability cap) { - return cap == Capabilities.SLURRY_HANDLER_CAPABILITY; + return cap == Capabilities.INFUSION_HANDLER_CAPABILITY; } @Override diff --git a/src/main/resources/assets/masterfulmachinery/textures/gui/mana_gui.png b/src/main/resources/assets/masterfulmachinery/textures/gui/mana_gui.png index eb077f4..9310932 100644 Binary files a/src/main/resources/assets/masterfulmachinery/textures/gui/mana_gui.png and b/src/main/resources/assets/masterfulmachinery/textures/gui/mana_gui.png differ diff --git a/version.properties b/version.properties index 192744c..37fddc7 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -#Wed Jun 02 14:35:30 BST 2021 -VERSION_CODE=358 +#Sun Jul 04 20:32:09 BST 2021 +VERSION_CODE=476