diff --git a/Makefile b/Makefile index 0c908b1..4b4a0a9 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ else GRADLE=./gradlew --no-daemon GRADLE_STOP=./gradlew --stop endif -TASK=djs ../../zmeta/lib/tasks.js +TASK=djs -s ../../zmeta/lib/tasks.js wildcardr=$(foreach d,$(wildcard $1*),$(call wildcardr,$d/,$2) $(filter $(subst *,%,$2),$d)) diff --git a/gradle.properties b/gradle.properties index 464b4da..ae31f82 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ meta_download=https://www.curseforge.com/minecraft/mc-mods/engineers-decor/ version_minecraft=1.19.2 version_forge_minecraft=1.19.2-43.1.16 version_jei=11.3.0.262 -version_engineersdecor=1.3.26 +version_engineersdecor=1.3.27 diff --git a/readme.md b/readme.md index dc6181a..4f16b4b 100644 --- a/readme.md +++ b/readme.md @@ -11,6 +11,8 @@ Mod sources for Minecraft version 1.18.x. ## Version history + ~ v1.3.27 [F] Refactored deprecated forge capability references. + - v1.3.26 [U] Ported to 1.19.2. [F] Fixed Mineral Melting Furnace fluid extraction (issue #223, ty adkinss). diff --git a/src/main/java/wile/engineersdecor/ModContent.java b/src/main/java/wile/engineersdecor/ModContent.java index 9a081f8..2eb6c62 100644 --- a/src/main/java/wile/engineersdecor/ModContent.java +++ b/src/main/java/wile/engineersdecor/ModContent.java @@ -477,7 +477,7 @@ public class ModContent BlockBehaviour.Properties.of(Material.METAL, MaterialColor.METAL).strength(0.3f, 10f).sound(SoundType.METAL).noOcclusion(), Auxiliaries.getPixeledAABB(0,0,6.5, 16,16,9.5) )); - Registries.addBlock("steel_railing", ()->new EdRailingBlock( + Registries.addBlock("steel_railing", ()->new EdgeAlignedRailingBlock( StandardBlocks.CFG_CUTOUT, BlockBehaviour.Properties.of(Material.METAL, MaterialColor.METAL).strength(0.3f, 10f).sound(SoundType.METAL).noOcclusion(), Auxiliaries.getPixeledAABB(0,0,0, 0, 0,0), diff --git a/src/main/java/wile/engineersdecor/blocks/EdBreaker.java b/src/main/java/wile/engineersdecor/blocks/EdBreaker.java index f0c286c..95c86fb 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdBreaker.java +++ b/src/main/java/wile/engineersdecor/blocks/EdBreaker.java @@ -38,8 +38,8 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import wile.engineersdecor.ModConfig; import wile.engineersdecor.ModContent; @@ -232,7 +232,7 @@ public class EdBreaker @Override public LazyOptional getCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable Direction facing) { - if(capability == CapabilityEnergy.ENERGY) return energy_handler_.cast(); + if(capability == ForgeCapabilities.ENERGY) return energy_handler_.cast(); return super.getCapability(capability, facing); } diff --git a/src/main/java/wile/engineersdecor/blocks/EdDropper.java b/src/main/java/wile/engineersdecor/blocks/EdDropper.java index 7e2b139..9b9106f 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdDropper.java +++ b/src/main/java/wile/engineersdecor/blocks/EdDropper.java @@ -43,8 +43,8 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import wile.engineersdecor.ModConfig; import wile.engineersdecor.ModContent; @@ -381,7 +381,7 @@ public class EdDropper @Override public LazyOptional getCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable Direction facing) { - if(capability==CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) return item_handler_.cast(); + if(capability == ForgeCapabilities.ITEM_HANDLER) return item_handler_.cast(); return super.getCapability(capability, facing); } @@ -426,7 +426,7 @@ public class EdDropper if(with_adjacent_item_insertion) { final BlockEntity te = world.getBlockEntity(pos.relative(facing)); if(te != null) { - final IItemHandler ih = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, (facing==null)?(null):(facing.getOpposite())).orElse(null); + final IItemHandler ih = te.getCapability(ForgeCapabilities.ITEM_HANDLER, (facing==null)?(null):(facing.getOpposite())).orElse(null); if(ih != null) { boolean inserted = false; List remaining = new ArrayList<>(); diff --git a/src/main/java/wile/engineersdecor/blocks/EdElectricalFurnace.java b/src/main/java/wile/engineersdecor/blocks/EdElectricalFurnace.java index 5c88f4a..921da04 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdElectricalFurnace.java +++ b/src/main/java/wile/engineersdecor/blocks/EdElectricalFurnace.java @@ -46,11 +46,10 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.event.ForgeEventFactory; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import wile.engineersdecor.ModConfig; @@ -394,8 +393,8 @@ public class EdElectricalFurnace @Override public LazyOptional getCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable Direction facing) { - if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) return item_handler_.cast(); - if(capability == CapabilityEnergy.ENERGY) return energy_handler_.cast(); + if(capability == ForgeCapabilities.ITEM_HANDLER) return item_handler_.cast(); + if(capability == ForgeCapabilities.ENERGY) return energy_handler_.cast(); return super.getCapability(capability, facing); } @@ -525,7 +524,7 @@ public class EdElectricalFurnace if(out && (!inventory_.getItem(FIFO_OUTPUT_1_SLOT_NO).isEmpty())) { BlockEntity te = level.getBlockEntity(worldPosition.relative(out_facing)); if(te!=null) { - IItemHandler hnd = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, out_facing).orElse(null); + IItemHandler hnd = te.getCapability(ForgeCapabilities.ITEM_HANDLER, out_facing).orElse(null); if(hnd != null) { ItemStack remaining = ItemHandlerHelper.insertItemStacked(hnd, inventory_.getItem(FIFO_OUTPUT_1_SLOT_NO).copy(), false); inventory_.setItem(FIFO_OUTPUT_1_SLOT_NO, remaining); diff --git a/src/main/java/wile/engineersdecor/blocks/EdFluidBarrel.java b/src/main/java/wile/engineersdecor/blocks/EdFluidBarrel.java index 4050c9a..1fcc21a 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdFluidBarrel.java +++ b/src/main/java/wile/engineersdecor/blocks/EdFluidBarrel.java @@ -45,10 +45,10 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import wile.engineersdecor.ModConfig; import wile.engineersdecor.ModContent; @@ -278,7 +278,7 @@ public class EdFluidBarrel @Override public LazyOptional getCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable Direction facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) return fluid_handler_.cast(); + if(capability == ForgeCapabilities.FLUID_HANDLER) return fluid_handler_.cast(); return super.getCapability(capability, facing); } diff --git a/src/main/java/wile/engineersdecor/blocks/EdFluidFunnel.java b/src/main/java/wile/engineersdecor/blocks/EdFluidFunnel.java index 4d427f8..972f70f 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdFluidFunnel.java +++ b/src/main/java/wile/engineersdecor/blocks/EdFluidFunnel.java @@ -39,9 +39,9 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import wile.engineersdecor.ModConfig; import wile.engineersdecor.ModContent; @@ -227,7 +227,7 @@ public class EdFluidFunnel @Override public LazyOptional getCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable Direction facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) return fluid_handler_.cast(); + if(capability == ForgeCapabilities.FLUID_HANDLER) return fluid_handler_.cast(); return super.getCapability(capability, facing); } @@ -369,7 +369,7 @@ public class EdFluidFunnel if(last_pick_pos_==null) last_pick_pos_ = worldPosition.above(); BlockEntity te = with_device_fluid_handler_collection ? (level.getBlockEntity(worldPosition.above())) : (null); if(te != null) { - IFluidHandler fh = te.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, Direction.DOWN).orElse(null); + IFluidHandler fh = te.getCapability(ForgeCapabilities.FLUID_HANDLER, Direction.DOWN).orElse(null); if(fh == null) { te = null; } else if(tank_.isEmpty()) { diff --git a/src/main/java/wile/engineersdecor/blocks/EdFreezer.java b/src/main/java/wile/engineersdecor/blocks/EdFreezer.java index df676fb..a6f7fbf 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdFreezer.java +++ b/src/main/java/wile/engineersdecor/blocks/EdFreezer.java @@ -40,12 +40,10 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import wile.engineersdecor.ModConfig; import wile.engineersdecor.ModContent; @@ -355,9 +353,9 @@ public class EdFreezer @Override public LazyOptional getCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable Direction facing) { - if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) return item_handler_.cast(); - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) return fluid_handler_.cast(); - if(capability == CapabilityEnergy.ENERGY) return energy_handler_.cast(); + if(capability == ForgeCapabilities.ITEM_HANDLER) return item_handler_.cast(); + if(capability == ForgeCapabilities.FLUID_HANDLER) return fluid_handler_.cast(); + if(capability == ForgeCapabilities.ENERGY) return energy_handler_.cast(); return super.getCapability(capability, facing); } diff --git a/src/main/java/wile/engineersdecor/blocks/EdFurnace.java b/src/main/java/wile/engineersdecor/blocks/EdFurnace.java index 27ab8c9..a676476 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdFurnace.java +++ b/src/main/java/wile/engineersdecor/blocks/EdFurnace.java @@ -48,11 +48,10 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.event.ForgeEventFactory; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.registries.ForgeRegistries; import wile.engineersdecor.ModConfig; @@ -456,11 +455,11 @@ public class EdFurnace @Override public LazyOptional getCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable Direction facing) { - if(capability==CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { + if(capability == ForgeCapabilities.ITEM_HANDLER) { if(facing == Direction.UP) return item_insertion_handler_.cast(); if(facing == Direction.DOWN) return item_extraction_handler_.cast(); return item_fuel_insertion_handler_.cast(); - } else if(capability== CapabilityEnergy.ENERGY) { + } else if(capability == ForgeCapabilities.ENERGY) { return energy_handler_.cast(); } return super.getCapability(capability, facing); diff --git a/src/main/java/wile/engineersdecor/blocks/EdHopper.java b/src/main/java/wile/engineersdecor/blocks/EdHopper.java index 959ce38..23144ce 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdHopper.java +++ b/src/main/java/wile/engineersdecor/blocks/EdHopper.java @@ -38,8 +38,8 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import wile.engineersdecor.ModContent; import wile.engineersdecor.libmc.*; @@ -352,7 +352,7 @@ public class EdHopper @Override public LazyOptional getCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable Direction facing) { - if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) return item_handler_.cast(); + if(capability == ForgeCapabilities.ITEM_HANDLER) return item_handler_.cast(); return super.getCapability(capability, facing); } @@ -416,7 +416,7 @@ public class EdHopper { final BlockEntity te = level.getBlockEntity(facing_pos); if(te != null) { - ih = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing.getOpposite()).orElse(null); + ih = te.getCapability(ForgeCapabilities.ITEM_HANDLER, facing.getOpposite()).orElse(null); if(ih == null) { delay_timer_ = TICK_INTERVAL+2; return false; } if(te instanceof net.minecraft.world.level.block.entity.HopperBlockEntity) { Direction f = level.getBlockState(facing_pos).getValue(net.minecraft.world.level.block.HopperBlock.FACING); @@ -564,7 +564,7 @@ public class EdHopper if(rssignal || pulse_mode) { Direction hopper_input_facing = (hopper_facing==Direction.UP) ? Direction.DOWN : Direction.UP; BlockEntity te = level.getBlockEntity(worldPosition.relative(hopper_input_facing)); - IItemHandler ih = (te==null) ? (null) : (te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, hopper_input_facing.getOpposite()).orElse(null)); + IItemHandler ih = (te==null) ? (null) : (te.getCapability(ForgeCapabilities.ITEM_HANDLER, hopper_input_facing.getOpposite()).orElse(null)); if((ih != null) || (te instanceof WorldlyContainer)) { // Tile Entity pulling if((ih != null)) { diff --git a/src/main/java/wile/engineersdecor/blocks/EdMilker.java b/src/main/java/wile/engineersdecor/blocks/EdMilker.java index af64fc6..12de8cd 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdMilker.java +++ b/src/main/java/wile/engineersdecor/blocks/EdMilker.java @@ -41,11 +41,10 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.Shapes; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; @@ -293,8 +292,8 @@ public class EdMilker @Override public LazyOptional getCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable Direction facing) { - if((capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) && has_milk_fluid()) return fluid_handler_.cast(); - if((capability == CapabilityEnergy.ENERGY) && (energy_consumption_>0)) return energy_handler_.cast(); + if((capability == ForgeCapabilities.FLUID_HANDLER) && has_milk_fluid()) return fluid_handler_.cast(); + if((capability == ForgeCapabilities.ENERGY) && (energy_consumption_>0)) return energy_handler_.cast(); return super.getCapability(capability, facing); } diff --git a/src/main/java/wile/engineersdecor/blocks/EdMineralSmelter.java b/src/main/java/wile/engineersdecor/blocks/EdMineralSmelter.java index d1e60b4..9e97539 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdMineralSmelter.java +++ b/src/main/java/wile/engineersdecor/blocks/EdMineralSmelter.java @@ -45,13 +45,11 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import wile.engineersdecor.ModConfig; import wile.engineersdecor.ModContent; @@ -382,9 +380,9 @@ public class EdMineralSmelter @Override public LazyOptional getCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable Direction facing) { - if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) return item_handler_.cast(); - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) return fluid_handler_.cast(); - if(capability == CapabilityEnergy.ENERGY) return energy_handler_.cast(); + if(capability == ForgeCapabilities.ITEM_HANDLER) return item_handler_.cast(); + if(capability == ForgeCapabilities.FLUID_HANDLER) return fluid_handler_.cast(); + if(capability == ForgeCapabilities.ENERGY) return energy_handler_.cast(); return super.getCapability(capability, facing); } diff --git a/src/main/java/wile/engineersdecor/blocks/EdPipeValve.java b/src/main/java/wile/engineersdecor/blocks/EdPipeValve.java index 482a451..23c8223 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdPipeValve.java +++ b/src/main/java/wile/engineersdecor/blocks/EdPipeValve.java @@ -31,9 +31,9 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import wile.engineersdecor.ModConfig; import wile.engineersdecor.ModContent; @@ -213,7 +213,7 @@ public class EdPipeValve @Override public LazyOptional getCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable Direction facing) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { + if(capability == ForgeCapabilities.FLUID_HANDLER) { Direction bf = block_facing(); if(facing == bf) return back_flow_handler_.cast(); if(facing == bf.getOpposite()) return fluid_handler_.cast(); @@ -229,7 +229,7 @@ public class EdPipeValve { final BlockEntity te = level.getBlockEntity(worldPosition.relative(block_facing())); if(te == null) return null; - return te.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, block_facing().getOpposite()).orElse(null); + return te.getCapability(ForgeCapabilities.FLUID_HANDLER, block_facing().getOpposite()).orElse(null); } // Forward flow handler -- diff --git a/src/main/java/wile/engineersdecor/blocks/EdPlacer.java b/src/main/java/wile/engineersdecor/blocks/EdPlacer.java index d48cb37..7ebb369 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdPlacer.java +++ b/src/main/java/wile/engineersdecor/blocks/EdPlacer.java @@ -48,10 +48,10 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.IPlantable; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.IFluidBlock; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import wile.engineersdecor.ModContent; import wile.engineersdecor.libmc.*; @@ -321,7 +321,7 @@ public class EdPlacer @Override public LazyOptional getCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable Direction facing) { - if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) return item_handler_.cast(); + if(capability == ForgeCapabilities.ITEM_HANDLER) return item_handler_.cast(); return super.getCapability(capability, facing); } diff --git a/src/main/java/wile/engineersdecor/blocks/EdSolarPanel.java b/src/main/java/wile/engineersdecor/blocks/EdSolarPanel.java index 41f3737..971b5da 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdSolarPanel.java +++ b/src/main/java/wile/engineersdecor/blocks/EdSolarPanel.java @@ -26,8 +26,8 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import wile.engineersdecor.ModConfig; import wile.engineersdecor.ModContent; @@ -139,7 +139,7 @@ public class EdSolarPanel @Override public LazyOptional getCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable Direction facing) { - if(capability== CapabilityEnergy.ENERGY) return energy_handler_.cast(); + if(capability == ForgeCapabilities.ENERGY) return energy_handler_.cast(); return super.getCapability(capability, facing); } @@ -174,7 +174,7 @@ public class EdSolarPanel final Direction f = transfer_directions_[i]; BlockEntity te = level.getBlockEntity(worldPosition.relative(f)); if(te==null) continue; - IEnergyStorage es = te.getCapability(CapabilityEnergy.ENERGY, f.getOpposite()).orElse(null); + IEnergyStorage es = te.getCapability(ForgeCapabilities.ENERGY, f.getOpposite()).orElse(null); if(es==null) continue; if(!es.canReceive()) { if(!(te instanceof SolarPanelTileEntity)) continue; diff --git a/src/main/java/wile/engineersdecor/blocks/EdTestBlock.java b/src/main/java/wile/engineersdecor/blocks/EdTestBlock.java index 869a628..60d0e49 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdTestBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdTestBlock.java @@ -30,13 +30,11 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.registries.ForgeRegistries; import wile.engineersdecor.ModContent; @@ -265,9 +263,9 @@ public class EdTestBlock public LazyOptional getCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable Direction facing) { if((!paused) && (facing != block_facing)) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) return fluid_handler_.cast(); - if(capability == CapabilityEnergy.ENERGY) return energy_handler_.cast(); - if(capability ==CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) return item_handler_.cast(); + if(capability == ForgeCapabilities.FLUID_HANDLER) return fluid_handler_.cast(); + if(capability == ForgeCapabilities.ENERGY) return energy_handler_.cast(); + if(capability == ForgeCapabilities.ITEM_HANDLER) return item_handler_.cast(); } return super.getCapability(capability, facing); } diff --git a/src/main/java/wile/engineersdecor/blocks/EdTreeCutter.java b/src/main/java/wile/engineersdecor/blocks/EdTreeCutter.java index 1065e60..24e9778 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdTreeCutter.java +++ b/src/main/java/wile/engineersdecor/blocks/EdTreeCutter.java @@ -31,8 +31,8 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import wile.engineersdecor.ModConfig; import wile.engineersdecor.ModContent; @@ -218,7 +218,7 @@ public class EdTreeCutter @Override public LazyOptional getCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable Direction facing) { - if(capability== CapabilityEnergy.ENERGY) return energy_handler_.cast(); + if(capability == ForgeCapabilities.ENERGY) return energy_handler_.cast(); return super.getCapability(capability, facing); } diff --git a/src/main/java/wile/engineersdecor/blocks/EdWasteIncinerator.java b/src/main/java/wile/engineersdecor/blocks/EdWasteIncinerator.java index 3d212d2..3224d64 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdWasteIncinerator.java +++ b/src/main/java/wile/engineersdecor/blocks/EdWasteIncinerator.java @@ -36,10 +36,9 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import wile.engineersdecor.ModConfig; import wile.engineersdecor.ModContent; @@ -281,8 +280,8 @@ public class EdWasteIncinerator @Override public LazyOptional getCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable Direction facing) { - if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) return item_handler_.cast(); - if(capability == CapabilityEnergy.ENERGY) return energy_handler_.cast(); + if(capability == ForgeCapabilities.ITEM_HANDLER) return item_handler_.cast(); + if(capability == ForgeCapabilities.ENERGY) return energy_handler_.cast(); return super.getCapability(capability, facing); } diff --git a/src/main/java/wile/engineersdecor/blocks/EdRailingBlock.java b/src/main/java/wile/engineersdecor/blocks/EdgeAlignedRailingBlock.java similarity index 94% rename from src/main/java/wile/engineersdecor/blocks/EdRailingBlock.java rename to src/main/java/wile/engineersdecor/blocks/EdgeAlignedRailingBlock.java index 5b1152c..cbefda8 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdRailingBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdgeAlignedRailingBlock.java @@ -1,5 +1,5 @@ /* - * @file EdCatwalkBlock.java + * @file EdgeAlignedRailingBlock.java * @author Stefan Wilhelm (wile) * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) @@ -34,9 +34,9 @@ import java.util.Collections; import java.util.List; -public class EdRailingBlock extends StandardBlocks.HorizontalFourWayWaterLoggable +public class EdgeAlignedRailingBlock extends StandardBlocks.HorizontalFourWayWaterLoggable { - public EdRailingBlock(long config, BlockBehaviour.Properties properties, final AABB base_aabb, final AABB railing_aabb) + public EdgeAlignedRailingBlock(long config, BlockBehaviour.Properties properties, final AABB base_aabb, final AABB railing_aabb) { super(config, properties, base_aabb, railing_aabb, 0); } @Override diff --git a/src/main/java/wile/engineersdecor/libmc/Fluidics.java b/src/main/java/wile/engineersdecor/libmc/Fluidics.java index 988ccb1..5507fc5 100644 --- a/src/main/java/wile/engineersdecor/libmc/Fluidics.java +++ b/src/main/java/wile/engineersdecor/libmc/Fluidics.java @@ -19,6 +19,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraft.nbt.Tag; import net.minecraftforge.common.util.LazyOptional; @@ -26,11 +27,9 @@ import net.minecraftforge.fluids.FluidActionResult; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.IFluidTank; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; import net.minecraftforge.fluids.capability.IFluidHandlerItem; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import javax.annotation.Nonnull; @@ -240,7 +239,7 @@ public class Fluidics if(held.isEmpty()) return null; final IFluidHandler fh = handler(world, pos, side); if(fh==null) return null; - final IItemHandler ih = player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).orElse(null); + final IItemHandler ih = player.getCapability(ForgeCapabilities.ITEM_HANDLER).orElse(null); if(ih==null) return null; FluidActionResult far = FluidUtil.tryFillContainerAndStow(held, fh, ih, Integer.MAX_VALUE, player, true); if(!far.isSuccess()) far = FluidUtil.tryEmptyContainerAndStow(held, fh, ih, Integer.MAX_VALUE, player, true); @@ -303,7 +302,7 @@ public class Fluidics @Override public LazyOptional getCapability(Capability capability, @Nullable Direction side) - { return (capability == CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY) ? handler_.cast() : LazyOptional.empty(); } + { return (capability == ForgeCapabilities.FLUID_HANDLER) ? handler_.cast() : LazyOptional.empty(); } protected FluidStack readnbt() { diff --git a/src/main/java/wile/engineersdecor/libmc/Inventories.java b/src/main/java/wile/engineersdecor/libmc/Inventories.java index 29a7f64..5714b3b 100644 --- a/src/main/java/wile/engineersdecor/libmc/Inventories.java +++ b/src/main/java/wile/engineersdecor/libmc/Inventories.java @@ -24,8 +24,8 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import net.minecraft.nbt.Tag; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.wrapper.InvWrapper; @@ -56,7 +56,7 @@ public class Inventories { BlockEntity te = world.getBlockEntity(pos); if(te==null) return null; - IItemHandler ih = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side).orElse(null); + IItemHandler ih = te.getCapability(ForgeCapabilities.ITEM_HANDLER, side).orElse(null); if(ih!=null) return ih; if((side!=null) && (te instanceof WorldlyContainer)) return new SidedInvWrapper((WorldlyContainer)te, side); if(te instanceof Container) return new InvWrapper((Container)te); @@ -81,7 +81,7 @@ public class Inventories public static IItemHandler itemhandler(Entity entity, @Nullable Direction side) { if(entity==null) return null; - final IItemHandler ih = entity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side).orElse(null); + final IItemHandler ih = entity.getCapability(ForgeCapabilities.ITEM_HANDLER, side).orElse(null); if(ih!=null) return ih; if(entity instanceof Container container) return (new InvWrapper(container)); return null; @@ -96,7 +96,7 @@ public class Inventories public static ItemStack insert(BlockEntity te, @Nullable Direction side, ItemStack stack, boolean simulate) { if(te == null) return stack; - IItemHandler hnd = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side).orElse(null); + IItemHandler hnd = te.getCapability(ForgeCapabilities.ITEM_HANDLER, side).orElse(null); if(hnd == null) { if((side != null) && (te instanceof WorldlyContainer)) { hnd = new SidedInvWrapper((WorldlyContainer)te, side); diff --git a/src/main/java/wile/engineersdecor/libmc/RfEnergy.java b/src/main/java/wile/engineersdecor/libmc/RfEnergy.java index 7a747ad..4b3962c 100644 --- a/src/main/java/wile/engineersdecor/libmc/RfEnergy.java +++ b/src/main/java/wile/engineersdecor/libmc/RfEnergy.java @@ -14,8 +14,8 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import javax.annotation.Nullable; @@ -26,7 +26,7 @@ public class RfEnergy { final BlockEntity te = world.getBlockEntity(pos); if(te == null) return 0; - final IEnergyStorage es = te.getCapability(CapabilityEnergy.ENERGY, side).orElse(null); + final IEnergyStorage es = te.getCapability(ForgeCapabilities.ENERGY, side).orElse(null); if(es == null) return 0; return es.receiveEnergy(rf_energy, false); } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index f68cb8d..f60f843 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -12,7 +12,7 @@ displayName="Engineer's Decor" description="Adds cosmetic blocks for the engineer's workshop, factory and home." authors="wilechaote" credits="BluSunrize, Damien Hazard, malte0811, et al., the Forge Smiths." -updateJSONURL="https://raw.githubusercontent.com/stfwi/engineers-decor/versions/1.19.json" +updateJSONURL="https://raw.githubusercontent.com/stfwi/engineers-decor/versions/forge-1.19.2.json" displayURL="https://www.curseforge.com/minecraft/mc-mods/engineers-decor" logoFile="logo.png"