Merge branch '1.20.1' into 1.20.1

src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json

@@ -0,0 +1,21 @@
+{
+ "values": [
+ "gtceu:medical_condition/none",
+ "gtceu:medical_condition/chemical_burns",
+ "gtceu:medical_condition/poison",
+ "gtceu:medical_condition/weak_poison",
+ "gtceu:medical_condition/irritant",
+ "gtceu:medical_condition/nausea",
+ "gtceu:medical_condition/carcinogen",
+ "gtceu:medical_condition/asbestosis",
+ "gtceu:medical_condition/arsenicosis",
+ "gtceu:medical_condition/silicosis",
+ "gtceu:medical_condition/berylliosis",
+ "gtceu:medical_condition/methanol_poisoning",
+ "gtceu:medical_condition/carbon_monoxide_poisoning",
+ "gtceu:heat",
+ "gtceu:chemical",
+ "gtceu:radiation",
+ "gtceu:turbine"
+ ]
+}

src/generated/resources/data/minecraft/tags/damage_type/is_explosion.json

@@ -0,0 +1,5 @@
+{
+ "values": [
+ "gtceu:explosion"
+ ]
+}

src/generated/resources/data/minecraft/tags/damage_type/is_fire.json

@@ -0,0 +1,5 @@
+{
+ "values": [
+ "gtceu:heat"
+ ]
+}

src/generated/resources/data/minecraft/tags/damage_type/is_lightning.json

@@ -0,0 +1,5 @@
+{
+ "values": [
+ "gtceu:electric"
+ ]
+}

src/main/java/com/gregtechceu/gtceu/GTCEu.java

@@ -70,10 +70,6 @@ public static boolean isSodiumRubidiumEmbeddiumLoaded() {
  LDLib.isModLoaded(GTValues.MODID_EMBEDDIUM);
  }
 
- public static boolean isRebornEnergyLoaded() {
- return Platform.isForge() || LDLib.isModLoaded(GTValues.MODID_REBORN_ENERGY);
- }
-
  public static boolean isAE2Loaded() {
  return LDLib.isModLoaded(GTValues.MODID_APPENG);
  }

src/main/java/com/gregtechceu/gtceu/api/blockentity/MetaMachineBlockEntity.java

@@ -3,8 +3,7 @@
 import com.gregtechceu.gtceu.GTCEu;
 import com.gregtechceu.gtceu.api.GTValues;
 import com.gregtechceu.gtceu.api.capability.*;
-import com.gregtechceu.gtceu.api.capability.forge.GTCapability;
-import com.gregtechceu.gtceu.api.capability.forge.GTEnergyHelperImpl;
+import com.gregtechceu.gtceu.api.capability.GTCapability;
 import com.gregtechceu.gtceu.api.item.tool.GTToolType;
 import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
 import com.gregtechceu.gtceu.api.machine.MetaMachine;
@@ -41,6 +40,7 @@
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.ForgeCapabilities;
 import net.minecraftforge.common.util.LazyOptional;
+import net.minecraftforge.energy.IEnergyStorage;
 
 import appeng.api.networking.IInWorldGridNodeHost;
 import appeng.capabilities.Capabilities;
@@ -230,15 +230,15 @@ public static <T> LazyOptional<T> getCapability(MetaMachine machine, @NotNull Ca
  LazyOptional.of(() -> FluidTransferHelperImpl.toFluidHandler(transfer)));
  }
  } else if (cap == ForgeCapabilities.ENERGY) {
- if (machine instanceof IPlatformEnergyStorage platformEnergyStorage) {
+ if (machine instanceof IEnergyStorage energyStorage) {
  return ForgeCapabilities.ENERGY.orEmpty(cap,
- LazyOptional.of(() -> GTEnergyHelperImpl.toEnergyStorage(platformEnergyStorage)));
+ LazyOptional.of(() -> energyStorage));
  }
- var list = getCapabilitiesFromTraits(machine.getTraits(), side, IPlatformEnergyStorage.class);
+ var list = getCapabilitiesFromTraits(machine.getTraits(), side, IEnergyStorage.class);
  if (!list.isEmpty()) {
  // TODO wrap list in the future
  return ForgeCapabilities.ENERGY.orEmpty(cap,
- LazyOptional.of(() -> GTEnergyHelperImpl.toEnergyStorage(list.get(0))));
+ LazyOptional.of(() -> list.get(0)));
  }
  } else if (cap == GTCapability.CAPABILITY_LASER) {
  if (machine instanceof ILaserContainer energyContainer) {

src/main/java/com/gregtechceu/gtceu/api/capability/forge/CombinedCapabilityProvider.java → src/main/java/com/gregtechceu/gtceu/api/capability/CombinedCapabilityProvider.java

@@ -1,4 +1,4 @@
-package com.gregtechceu.gtceu.api.capability.forge;
+package com.gregtechceu.gtceu.api.capability;
 
 import net.minecraft.core.Direction;
 import net.minecraftforge.common.capabilities.Capability;

src/main/java/com/gregtechceu/gtceu/api/capability/forge/GTCapability.java → src/main/java/com/gregtechceu/gtceu/api/capability/GTCapability.java

@@ -1,6 +1,5 @@
-package com.gregtechceu.gtceu.api.capability.forge;
+package com.gregtechceu.gtceu.api.capability;
 
-import com.gregtechceu.gtceu.api.capability.*;
 import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine;
 import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
 

src/main/java/com/gregtechceu/gtceu/api/capability/GTCapabilityHelper.java

@@ -1,7 +1,5 @@
 package com.gregtechceu.gtceu.api.capability;
 
-import com.gregtechceu.gtceu.api.capability.forge.GTCapability;
-import com.gregtechceu.gtceu.api.capability.forge.GTEnergyHelperImpl;
 import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine;
 import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
 
@@ -30,9 +28,8 @@ public static IElectricItem getElectricItem(ItemStack itemStack) {
  }
 
  @Nullable
- public static IPlatformEnergyStorage getPlatformEnergyItem(ItemStack itemStack) {
- IEnergyStorage energyItemStorage = itemStack.getCapability(ForgeCapabilities.ENERGY).resolve().orElse(null);
- return energyItemStorage == null ? null : GTEnergyHelperImpl.toPlatformEnergyStorage(energyItemStorage);
+ public static IEnergyStorage getForgeEnergyItem(ItemStack itemStack) {
+ return itemStack.getCapability(ForgeCapabilities.ENERGY).resolve().orElse(null);
  }
 
  @Nullable
@@ -71,12 +68,11 @@ public static RecipeLogic getRecipeLogic(Level level, BlockPos pos, @Nullable Di
  }
 
  @Nullable
- public static IPlatformEnergyStorage getPlatformEnergy(Level level, BlockPos pos, @Nullable Direction side) {
+ public static IEnergyStorage getForgeEnergy(Level level, BlockPos pos, @Nullable Direction side) {
  if (level.getBlockState(pos).hasBlockEntity()) {
  var blockEntity = level.getBlockEntity(pos);
  if (blockEntity != null) {
- IEnergyStorage energyStorage = blockEntity.getCapability(ForgeCapabilities.ENERGY, side).orElse(null);
- return energyStorage == null ? null : GTEnergyHelperImpl.toPlatformEnergyStorage(energyStorage);
+ return blockEntity.getCapability(ForgeCapabilities.ENERGY, side).orElse(null);
  }
  }
  return null;

src/main/java/com/gregtechceu/gtceu/api/capability/forge/compat/CapabilityCompatProvider.java → src/main/java/com/gregtechceu/gtceu/api/capability/compat/CapabilityCompatProvider.java

@@ -1,4 +1,4 @@
-package com.gregtechceu.gtceu.api.capability.forge.compat;
+package com.gregtechceu.gtceu.api.capability.compat;
 
 import net.minecraft.core.Direction;
 import net.minecraftforge.common.capabilities.Capability;