Skip to content

Commit f90e4da

Browse files
RuochenFu21RuochenFu21
committed
Port, bumped version
1 parent e203edd commit f90e4da

File tree

12 files changed

+52
-61
lines changed

12 files changed

+52
-61
lines changed

‎build.gradle‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -115,18 +115,9 @@ minecraft {
115115
sourceSets.main.resources { srcDir 'src/generated/resources' }
116116

117117
repositories {
118-
// Put repositories for dependencies here
119-
// NeoGradle automatically adds the Forge maven and Maven Central for you
120-
121-
// If you have mod jar dependencies in ./libs, you can declare them as a repository like so.
122-
// See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver
123-
// flatDir {
124-
// dir 'libs'
125-
// }
126-
maven {
127-
name = 'tterrag maven'
128-
url = 'https://maven.tterrag.com/'
129-
}
118+
maven { url = "https://maven.createmod.net" } // Create, Ponder, Flywheel
119+
maven { url = "https://maven.tterrag.com" } // Registrate
120+
maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" } // ForgeConfigAPIPort
130121
}
131122

132123
dependencies {
@@ -137,9 +128,13 @@ dependencies {
137128
// then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
138129
minecraft "net.neoforged:forge:${minecraft_version}-${neo_version}"
139130
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
140-
implementation fg.deobf("com.simibubi.create:create-${create_minecraft_version}:${create_version}:slim") { transitive = false }
141-
implementation fg.deobf("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}")
142-
implementation fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}")
131+
implementation(fg.deobf("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false })
132+
implementation(fg.deobf("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}"))
133+
compileOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-api-${minecraft_version}:${flywheel_version}"))
134+
runtimeOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-${minecraft_version}:${flywheel_version}"))
135+
implementation(fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}"))
136+
compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.4.1"))
137+
implementation("io.github.llamalad7:mixinextras-forge:0.4.1")
143138

144139
// Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
145140
// The JEI API is declared for compile time use, while the full JEI artifact is used at runtime

‎gradle.properties‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ neo_version = 47.1.25
99
neo_version_range = [47.1,)
1010
loader_version_range = [47,)
1111

12-
create_minecraft_version = 1.20.1
13-
flywheel_minecraft_version = 1.20.1
14-
create_version = 0.5.1.e-22
15-
flywheel_version = 0.6.10-7
12+
create_version = 6.0.2-52
13+
ponder_version = 1.0.51
14+
flywheel_version = 1.0.1
1615
registrate_version = MC1.20-1.3.3
1716

1817
mapping_channel = official
@@ -21,8 +20,8 @@ mapping_version = 1.20.1
2120

2221
mod_id = createendertransmission
2322
mod_name = Create Ender Transmission
24-
mod_license = MIT
25-
mod_version = 2.0.7-1.20.1
23+
mod_license = All Right Reserved
24+
mod_version = 2.1.0-1.20.1
2625
mod_group_id = com.forsteri.createendertransmission
2726
mod_authors = Forsteri
2827
pack_format_number = 15

‎src/main/java/com/forsteri/createendertransmission/blocks/chunkLoader/LoaderBlockEntity.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package com.forsteri.createendertransmission.blocks.chunkLoader;
22

33
import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
4-
import com.simibubi.create.foundation.utility.Components;
5-
import com.simibubi.create.foundation.utility.Lang;
6-
import com.simibubi.create.foundation.utility.LangBuilder;
4+
import com.simibubi.create.foundation.utility.CreateLang;
75
import com.forsteri.createendertransmission.CreateEnderTransmission;
6+
import net.createmod.catnip.lang.LangBuilder;
87
import net.minecraft.ChatFormatting;
98
import net.minecraft.core.BlockPos;
109
import net.minecraft.network.chat.Component;
@@ -52,9 +51,9 @@ public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneak
5251

5352
int radius = (int) Math.abs(getSpeed()) / 128 * 2 + 1;
5453

55-
Lang.builder().space().addTo(tooltip);
54+
CreateLang.builder().space().addTo(tooltip);
5655

57-
new LangBuilder(CreateEnderTransmission.MOD_ID).add(Components.translatable(
56+
new LangBuilder(CreateEnderTransmission.MOD_ID).add(Component.translatable(
5857
CreateEnderTransmission.MOD_ID + ".chunk_loader.loaded",
5958
radius * radius
6059
)).style(ChatFormatting.GREEN).forGoggles(tooltip);

‎src/main/java/com/forsteri/createendertransmission/blocks/chunkLoader/LoaderInstance.java‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
package com.forsteri.createendertransmission.blocks.chunkLoader;
22

3-
import com.jozufozu.flywheel.api.Instancer;
4-
import com.jozufozu.flywheel.api.MaterialManager;
53
import com.simibubi.create.AllPartialModels;
6-
import com.simibubi.create.content.kinetics.base.SingleRotatingInstance;
7-
import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
4+
import com.simibubi.create.content.kinetics.base.SingleAxisRotatingVisual;
5+
import dev.engine_room.flywheel.api.visualization.VisualizationContext;
6+
import dev.engine_room.flywheel.lib.model.Models;
87
import net.minecraft.core.Direction;
98

10-
public class LoaderInstance extends SingleRotatingInstance<LoaderBlockEntity> {
11-
public LoaderInstance(MaterialManager modelManager, LoaderBlockEntity tileEntity) {
12-
super(modelManager, tileEntity);
13-
}
14-
15-
@Override
16-
protected Instancer<RotatingData> getModel() {
17-
return getRotatingMaterial().getModel(AllPartialModels.SHAFT_HALF, blockState, Direction.DOWN);
9+
public class LoaderInstance extends SingleAxisRotatingVisual<LoaderBlockEntity> {
10+
public LoaderInstance(VisualizationContext context, LoaderBlockEntity blockEntity, float partialTick) {
11+
super(context, blockEntity, partialTick, Direction.DOWN, Models.partial(AllPartialModels.SHAFT_HALF));
1812
}
1913
}

‎src/main/java/com/forsteri/createendertransmission/blocks/energyTransmitter/EnergyTransmitterBlock.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock;
88
import com.simibubi.create.content.kinetics.base.KineticBlock;
99
import com.simibubi.create.foundation.block.IBE;
10-
import com.simibubi.create.foundation.gui.ScreenOpener;
1110
import com.forsteri.createendertransmission.transmitUtil.TransmitterScreen;
11+
import net.createmod.catnip.gui.ScreenOpener;
1212
import net.minecraft.client.player.LocalPlayer;
1313
import net.minecraft.core.BlockPos;
1414
import net.minecraft.core.Direction;

‎src/main/java/com/forsteri/createendertransmission/blocks/fluidTrasmitter/FluidTransmitterBlock.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import com.forsteri.createendertransmission.entry.TransmissionBlocks;
55
import com.simibubi.create.content.equipment.wrench.IWrenchable;
66
import com.simibubi.create.foundation.block.IBE;
7-
import com.simibubi.create.foundation.gui.ScreenOpener;
87
import com.forsteri.createendertransmission.transmitUtil.TransmitterScreen;
8+
import net.createmod.catnip.gui.ScreenOpener;
99
import net.minecraft.client.player.LocalPlayer;
1010
import net.minecraft.core.BlockPos;
1111
import net.minecraft.world.InteractionHand;

‎src/main/java/com/forsteri/createendertransmission/blocks/fluidTrasmitter/FluidTransmitterInventoryHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.forsteri.createendertransmission.blocks.fluidTrasmitter;
22

33
import com.simibubi.create.foundation.fluid.CombinedTankWrapper;
4-
import com.simibubi.create.foundation.utility.Iterate;
4+
import net.createmod.catnip.data.Iterate;
55
import net.minecraft.nbt.CompoundTag;
66
import net.minecraftforge.common.util.INBTSerializable;
77
import net.minecraftforge.fluids.FluidStack;

‎src/main/java/com/forsteri/createendertransmission/blocks/itemTransmitter/ItemTransmitterBlock.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import com.forsteri.createendertransmission.entry.TransmissionBlocks;
55
import com.simibubi.create.content.equipment.wrench.IWrenchable;
66
import com.simibubi.create.foundation.block.IBE;
7-
import com.simibubi.create.foundation.gui.ScreenOpener;
87
import com.forsteri.createendertransmission.transmitUtil.TransmitterScreen;
8+
import net.createmod.catnip.gui.ScreenOpener;
99
import net.minecraft.client.player.LocalPlayer;
1010
import net.minecraft.core.BlockPos;
1111
import net.minecraft.world.InteractionHand;

‎src/main/java/com/forsteri/createendertransmission/entry/TransmissionBlockEntities.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.forsteri.createendertransmission.entry;
22

3-
import com.simibubi.create.content.kinetics.base.ShaftInstance;
3+
import com.simibubi.create.content.kinetics.base.ShaftVisual;
44
import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
55
import com.simibubi.create.foundation.data.CreateRegistrate;
66
import com.tterrag.registrate.util.entry.BlockEntityEntry;
@@ -18,14 +18,14 @@ public class TransmissionBlockEntities {
1818

1919
public static final BlockEntityEntry<LoaderBlockEntity> CHUNK_LOADER_TILE = REGISTRATE
2020
.blockEntity("chunk_loader", LoaderBlockEntity::new)
21-
.instance(() -> LoaderInstance::new, false)
21+
.visual(() -> LoaderInstance::new, false)
2222
.validBlocks(TransmissionBlocks.CHUNK_LOADER_BLOCK)
2323
.renderer(() -> SmartBlockEntityRenderer::new)
2424
.register();
2525

2626
public static final BlockEntityEntry<EnergyTransmitterBlockEntity> ENERGY_TRANSMITTER_TILE = REGISTRATE
2727
.blockEntity("energy_transmitter", EnergyTransmitterBlockEntity::new)
28-
.instance(() -> ShaftInstance::new, false)
28+
.visual(() -> ShaftVisual::new, false)
2929
.validBlocks(TransmissionBlocks.ENERGY_TRANSMITTER_BLOCK)
3030
.renderer(() -> SmartBlockEntityRenderer::new)
3131
.register();

‎src/main/java/com/forsteri/createendertransmission/entry/TransmissionBlocks.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.forsteri.createendertransmission.blocks.energyTransmitter.EnergyTransmitterBlock;
66
import com.forsteri.createendertransmission.blocks.fluidTrasmitter.FluidTransmitterBlock;
77
import com.forsteri.createendertransmission.blocks.itemTransmitter.ItemTransmitterBlock;
8-
import com.simibubi.create.content.kinetics.BlockStressDefaults;
8+
import com.simibubi.create.api.stress.BlockStressValues;
99
import com.simibubi.create.foundation.data.BlockStateGen;
1010
import com.simibubi.create.foundation.data.CreateRegistrate;
1111
import com.tterrag.registrate.util.entry.BlockEntry;
@@ -42,7 +42,9 @@ public class TransmissionBlocks {
4242
.model((context, provider) -> provider.withExistingParent(context.getName(), provider.modLoc("block/" + context.getName() + "/block")))
4343
.build()
4444
.addLayer(() -> RenderType::cutoutMipped)
45-
.transform(BlockStressDefaults.setImpact(16))
45+
.onRegister((block) -> {
46+
BlockStressValues.IMPACTS.register(block, () -> 16);
47+
})
4648
.register();
4749

4850
public static final BlockEntry<EnergyTransmitterBlock> ENERGY_TRANSMITTER_BLOCK =
@@ -57,7 +59,9 @@ public class TransmissionBlocks {
5759
.model(NonNullBiConsumer.noop())
5860
.transform(customItemModel())
5961
.addLayer(() -> RenderType::cutoutMipped)
60-
.transform(BlockStressDefaults.setImpact(8))
62+
.onRegister((block) -> {
63+
BlockStressValues.IMPACTS.register(block, () -> 8.0);
64+
})
6165
.register();
6266

6367
public static final BlockEntry<ItemTransmitterBlock> ITEM_TRANSMITTER_BLOCK =

0 commit comments

Comments
 (0)