Skip to content

Commit 846ed08

Browse files
committed
Backport to 1.18.2
1 parent 8132e68 commit 846ed08

File tree

5 files changed

+17
-30
lines changed

5 files changed

+17
-30
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ repositories {
6969

7070
dependencies {
7171
minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
72-
implementation fg.deobf("curse.maven:refined-storage-243076:4844585")
72+
implementation fg.deobf("curse.maven:refined-storage-243076:4902316")
7373

7474
}
7575

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mc_version=1.20.1
1+
mc_version=1.18.2
22
mod_version=2.3.2
33
mapping_channel=official
4-
forge_version=47.3.1
4+
forge_version=40.2.0

src/main/java/com/zengyj/exposer/Exposer.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,11 @@
1212
@Mod(Constants.Mod_ID)
1313
public class Exposer {
1414
public static final Logger LOGGER = LogManager.getLogger(Constants.Mod_ID);
15+
16+
public static final CreativeModeTab TAB = new CreativeModeTab(Constants.Mod_ID) {
17+
@Override
18+
public ItemStack makeIcon() {
19+
return new ItemStack(Registry.EXPOSER_ITEM.get());
20+
}
21+
};
1522
}

src/main/java/com/zengyj/exposer/Registry.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import com.zengyj.exposer.block.BlockExposer;
44
import com.zengyj.exposer.tile.TileExposer;
5-
import net.minecraft.core.registries.Registries;
6-
import net.minecraft.network.chat.Component;
75
import net.minecraft.world.item.*;
86
import net.minecraft.world.level.block.Block;
97
import net.minecraft.world.level.block.entity.BlockEntityType;
@@ -17,17 +15,11 @@
1715
public class Registry {
1816
private static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, Constants.Mod_ID);
1917
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, Constants.Mod_ID);
20-
public static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, Constants.Mod_ID);
21-
public static final DeferredRegister<CreativeModeTab> CREATIVE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, Constants.Mod_ID);
18+
public static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, Constants.Mod_ID);
2219

2320
public static final RegistryObject<Block> EXPOSER = BLOCKS.register("exposer", BlockExposer::new);
24-
public static final RegistryObject<Item> EXPOSER_ITEM = ITEMS.register("exposer", () -> new BlockItem(EXPOSER.get(),new Item.Properties()));
21+
public static final RegistryObject<Item> EXPOSER_ITEM = ITEMS.register("exposer", () -> new BlockItem(EXPOSER.get(),new Item.Properties().tab(Exposer.TAB)));
2522

26-
public static final RegistryObject<CreativeModeTab> TAB = CREATIVE_TABS.register("exposer", ()->
27-
CreativeModeTab.builder().withTabsBefore(CreativeModeTabs.SPAWN_EGGS)
28-
.icon(()-> new ItemStack(EXPOSER.get())).displayItems((itemDisplayParameters, output) -> {
29-
output.accept(EXPOSER_ITEM.get());
30-
}).title(Component.translatable("exposer.modid")).build());
3123

3224
public static final RegistryObject<BlockEntityType<TileExposer>> EXPOSER_TYPE = BLOCK_ENTITY_TYPES.register("requester", () -> BlockEntityType.Builder
3325
.of(TileExposer::new, Registry.EXPOSER.get())
@@ -36,7 +28,6 @@ public class Registry {
3628
static {
3729
BLOCKS.register(FMLJavaModLoadingContext.get().getModEventBus());
3830
ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus());
39-
CREATIVE_TABS.register(FMLJavaModLoadingContext.get().getModEventBus());
4031
BLOCK_ENTITY_TYPES.register(FMLJavaModLoadingContext.get().getModEventBus());
4132
}
4233
}

src/main/java/com/zengyj/exposer/tile/TileExposer.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.refinedmods.refinedstorage.RSBlockEntities;
44
import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity;
5-
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationSpec;
65
import com.zengyj.exposer.Exposer;
76
import com.zengyj.exposer.Registry;
87
import com.zengyj.exposer.node.NetworkNodeExposer;
@@ -11,10 +10,11 @@
1110
import net.minecraft.world.level.Level;
1211
import net.minecraft.world.level.block.state.BlockState;
1312
import net.minecraftforge.common.capabilities.Capability;
14-
import net.minecraftforge.common.capabilities.ForgeCapabilities;
1513
import net.minecraftforge.common.util.LazyOptional;
1614
import net.minecraftforge.common.util.NonNullSupplier;
15+
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
1716
import net.minecraftforge.fluids.capability.IFluidHandler;
17+
import net.minecraftforge.items.CapabilityItemHandler;
1818
import net.minecraftforge.items.IItemHandler;
1919
import org.checkerframework.checker.nullness.qual.NonNull;
2020
import org.checkerframework.checker.nullness.qual.Nullable;
@@ -25,42 +25,35 @@ public class TileExposer extends NetworkNodeBlockEntity<NetworkNodeExposer> {
2525
private NonNullSupplier<IItemHandler> itemSupplier;
2626
private NonNullSupplier<IFluidHandler> fluidSupplier;
2727

28-
public static BlockEntitySynchronizationSpec SPEC;
29-
3028
public TileExposer(BlockPos pos, BlockState state) {
31-
super(Registry.EXPOSER_TYPE.get(), pos, state, SPEC);
32-
// Exposer.LOGGER.info("Creating TileExposer");
29+
super(Registry.EXPOSER_TYPE.get(), pos, state);
3330
}
3431

3532

3633
@NonNull
3734
@Override
3835
public <T> LazyOptional<T> getCapability(@NonNull Capability<T> cap, @Nullable Direction direction) {
39-
if (cap == ForgeCapabilities.ITEM_HANDLER){
40-
// Exposer.LOGGER.info("Start expose item handler");
36+
if (cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY){
4137
if (itemSupplier != null){
42-
// Exposer.LOGGER.info("expose exist item handler");
4338
return (LazyOptional<T>) LazyOptional.of(itemSupplier);
4439
}
4540

4641
if (getNode().getItemHandler() == null){
47-
// Exposer.LOGGER.info("return empty item handler");
4842
return LazyOptional.empty();
4943
}
5044

5145
itemSupplier = new NonNullSupplier<>() {
5246
@NonNull
5347
@Override
5448
public IItemHandler get() {
55-
// Exposer.LOGGER.info("get expose item handler");
5649
return getNode().getItemHandler();
5750
}
5851
};
5952

6053
return (LazyOptional<T>) LazyOptional.of(itemSupplier);
6154
}
6255

63-
if (cap == ForgeCapabilities.FLUID_HANDLER){
56+
if (cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){
6457
if (fluidSupplier != null){
6558
return (LazyOptional<T>) LazyOptional.of(fluidSupplier);
6659
}
@@ -87,8 +80,4 @@ public IFluidHandler get() {
8780
public NetworkNodeExposer createNode(Level level, BlockPos blockPos) {
8881
return new NetworkNodeExposer(level,blockPos);
8982
}
90-
91-
static {
92-
SPEC = BlockEntitySynchronizationSpec.builder().build();
93-
}
9483
}

0 commit comments

Comments
 (0)