Skip to content

Commit 0d9382c

Browse files
code-onigiricode-onigiri
authored
Merge branch 'GregTechCEu:1.20.1' into 1.20.1
2 parents 5cc0e7d + 33721d4 commit 0d9382c

File tree

54 files changed

+764
-430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+764
-430
lines changed

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"values": [
3+
"gtceu:medical_condition/none",
4+
"gtceu:medical_condition/chemical_burns",
5+
"gtceu:medical_condition/poison",
6+
"gtceu:medical_condition/weak_poison",
7+
"gtceu:medical_condition/irritant",
8+
"gtceu:medical_condition/nausea",
9+
"gtceu:medical_condition/carcinogen",
10+
"gtceu:medical_condition/asbestosis",
11+
"gtceu:medical_condition/arsenicosis",
12+
"gtceu:medical_condition/silicosis",
13+
"gtceu:medical_condition/berylliosis",
14+
"gtceu:medical_condition/methanol_poisoning",
15+
"gtceu:medical_condition/carbon_monoxide_poisoning",
16+
"gtceu:heat",
17+
"gtceu:chemical",
18+
"gtceu:radiation",
19+
"gtceu:turbine"
20+
]
21+
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"gtceu:explosion"
4+
]
5+
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"gtceu:heat"
4+
]
5+
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"gtceu:electric"
4+
]
5+
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ public static boolean isSodiumRubidiumEmbeddiumLoaded() {
7070
LDLib.isModLoaded(GTValues.MODID_EMBEDDIUM);
7171
}
7272

73-
public static boolean isRebornEnergyLoaded() {
74-
return Platform.isForge() || LDLib.isModLoaded(GTValues.MODID_REBORN_ENERGY);
75-
}
76-
7773
public static boolean isAE2Loaded() {
7874
return LDLib.isModLoaded(GTValues.MODID_APPENG);
7975
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
import com.gregtechceu.gtceu.GTCEu;
44
import com.gregtechceu.gtceu.api.GTValues;
55
import com.gregtechceu.gtceu.api.capability.*;
6-
import com.gregtechceu.gtceu.api.capability.forge.GTCapability;
7-
import com.gregtechceu.gtceu.api.capability.forge.GTEnergyHelperImpl;
6+
import com.gregtechceu.gtceu.api.capability.GTCapability;
87
import com.gregtechceu.gtceu.api.item.tool.GTToolType;
98
import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
109
import com.gregtechceu.gtceu.api.machine.MetaMachine;
@@ -41,6 +40,7 @@
4140
import net.minecraftforge.common.capabilities.Capability;
4241
import net.minecraftforge.common.capabilities.ForgeCapabilities;
4342
import net.minecraftforge.common.util.LazyOptional;
43+
import net.minecraftforge.energy.IEnergyStorage;
4444

4545
import appeng.api.networking.IInWorldGridNodeHost;
4646
import appeng.capabilities.Capabilities;
@@ -230,15 +230,15 @@ public static <T> LazyOptional<T> getCapability(MetaMachine machine, @NotNull Ca
230230
LazyOptional.of(() -> FluidTransferHelperImpl.toFluidHandler(transfer)));
231231
}
232232
} else if (cap == ForgeCapabilities.ENERGY) {
233-
if (machine instanceof IPlatformEnergyStorage platformEnergyStorage) {
233+
if (machine instanceof IEnergyStorage energyStorage) {
234234
return ForgeCapabilities.ENERGY.orEmpty(cap,
235-
LazyOptional.of(() -> GTEnergyHelperImpl.toEnergyStorage(platformEnergyStorage)));
235+
LazyOptional.of(() -> energyStorage));
236236
}
237-
var list = getCapabilitiesFromTraits(machine.getTraits(), side, IPlatformEnergyStorage.class);
237+
var list = getCapabilitiesFromTraits(machine.getTraits(), side, IEnergyStorage.class);
238238
if (!list.isEmpty()) {
239239
// TODO wrap list in the future
240240
return ForgeCapabilities.ENERGY.orEmpty(cap,
241-
LazyOptional.of(() -> GTEnergyHelperImpl.toEnergyStorage(list.get(0))));
241+
LazyOptional.of(() -> list.get(0)));
242242
}
243243
} else if (cap == GTCapability.CAPABILITY_LASER) {
244244
if (machine instanceof ILaserContainer energyContainer) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gregtechceu.gtceu.api.capability.forge;
1+
package com.gregtechceu.gtceu.api.capability;
22

33
import net.minecraft.core.Direction;
44
import net.minecraftforge.common.capabilities.Capability;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package com.gregtechceu.gtceu.api.capability.forge;
1+
package com.gregtechceu.gtceu.api.capability;
22

3-
import com.gregtechceu.gtceu.api.capability.*;
43
import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine;
54
import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
65

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.gregtechceu.gtceu.api.capability;
22

3-
import com.gregtechceu.gtceu.api.capability.forge.GTCapability;
4-
import com.gregtechceu.gtceu.api.capability.forge.GTEnergyHelperImpl;
53
import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine;
64
import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
75

@@ -30,9 +28,8 @@ public static IElectricItem getElectricItem(ItemStack itemStack) {
3028
}
3129

3230
@Nullable
33-
public static IPlatformEnergyStorage getPlatformEnergyItem(ItemStack itemStack) {
34-
IEnergyStorage energyItemStorage = itemStack.getCapability(ForgeCapabilities.ENERGY).resolve().orElse(null);
35-
return energyItemStorage == null ? null : GTEnergyHelperImpl.toPlatformEnergyStorage(energyItemStorage);
31+
public static IEnergyStorage getForgeEnergyItem(ItemStack itemStack) {
32+
return itemStack.getCapability(ForgeCapabilities.ENERGY).resolve().orElse(null);
3633
}
3734

3835
@Nullable
@@ -71,12 +68,11 @@ public static RecipeLogic getRecipeLogic(Level level, BlockPos pos, @Nullable Di
7168
}
7269

7370
@Nullable
74-
public static IPlatformEnergyStorage getPlatformEnergy(Level level, BlockPos pos, @Nullable Direction side) {
71+
public static IEnergyStorage getForgeEnergy(Level level, BlockPos pos, @Nullable Direction side) {
7572
if (level.getBlockState(pos).hasBlockEntity()) {
7673
var blockEntity = level.getBlockEntity(pos);
7774
if (blockEntity != null) {
78-
IEnergyStorage energyStorage = blockEntity.getCapability(ForgeCapabilities.ENERGY, side).orElse(null);
79-
return energyStorage == null ? null : GTEnergyHelperImpl.toPlatformEnergyStorage(energyStorage);
75+
return blockEntity.getCapability(ForgeCapabilities.ENERGY, side).orElse(null);
8076
}
8177
}
8278
return null;

‎src/main/java/com/gregtechceu/gtceu/api/capability/IPlatformEnergyStorage.java‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)