Skip to content

Commit bf5cc28

Browse files
finished my part
1 parent e6e91fd commit bf5cc28

File tree

55 files changed

+610
-604
lines changed

Some content is hidden

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

55 files changed

+610
-604
lines changed

src/main/java/com/rae/creatingspace/CreatingSpace.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020
import com.simibubi.create.foundation.item.ItemDescription;
2121
import com.simibubi.create.foundation.item.KineticStats;
2222
import com.simibubi.create.foundation.item.TooltipModifier;
23-
import com.simibubi.create.foundation.utility.DistExecutor;
2423
import net.createmod.catnip.lang.FontHelper;
2524
import net.minecraft.resources.ResourceLocation;
2625

27-
import net.neoforged.api.distmarker.Dist;
2826
import net.neoforged.bus.api.EventPriority;
2927
import net.neoforged.bus.api.IEventBus;
3028
import net.neoforged.fml.ModContainer;

src/main/java/com/rae/creatingspace/api/gui/elements/SliderWidget.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,14 @@ public void setMax(int max) {
5555
@Override
5656
public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
5757
if (visible){
58-
int progress = (int) Mth.lerp(partialTicks,prevValue, value);
59-
60-
lerpedValue.chase(value,1, LerpedFloat.Chaser.EXP);
6158
lerpedValue.tickChaser();
6259

63-
progress = (int) lerpedValue.getValue();
60+
int progress = (int) lerpedValue.getValue();
6461

6562
int intervalNumber = (max-min)/50;
6663
int intervalPixel = 10;
6764

68-
int slidePixel = (int) (((float) progress - (progress / intervalNumber) *intervalNumber)/((float)intervalNumber) * intervalPixel);
65+
int slidePixel = (int) (((float) progress - ((float) progress / intervalNumber) *intervalNumber)/((float)intervalNumber) * intervalPixel);
6966

7067
graphics.pose().pushPose();
7168
GuiTexturesInit slider = GuiTexturesInit.O2_GAUGE_SLIDER;
@@ -102,8 +99,7 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float
10299
}
103100
}
104101

105-
public void setValues(int value, int prevValue) {
106-
this.prevValue = prevValue;
107-
this.value = value;
102+
public void setChase(int o2Value) {
103+
lerpedValue.updateChaseTarget(o2Value);
108104
}
109105
}

src/main/java/com/rae/creatingspace/api/planets/RocketAccessibleDimension.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.mojang.serialization.Codec;
44
import com.mojang.serialization.codecs.RecordCodecBuilder;
55
import com.mojang.serialization.codecs.UnboundedMapCodec;
6+
import com.rae.creatingspace.CreatingSpace;
67
import net.minecraft.core.Registry;
78
import net.minecraft.resources.ResourceKey;
89
import net.minecraft.resources.ResourceLocation;
@@ -15,8 +16,8 @@
1516
*/
1617
public class RocketAccessibleDimension {
1718
public static final ResourceKey<Registry<RocketAccessibleDimension>> REGISTRY_KEY =
18-
ResourceKey.createRegistryKey(new ResourceLocation("creatingspace:rocket_accessible_dimension"));
19-
public static final ResourceLocation BASE_BODY = new ResourceLocation("sun");
19+
ResourceKey.createRegistryKey(CreatingSpace.resource("rocket_accessible_dimension"));
20+
public static final ResourceLocation BASE_BODY = ResourceLocation.parse("sun");
2021
public static final UnboundedMapCodec<ResourceLocation, AccessibilityParameter> ADJACENT_DIMENSIONS_CODEC =
2122
Codec.unboundedMap(ResourceLocation.CODEC, AccessibilityParameter.CODEC);
2223
//use ResourceLocation rather than ResourceKey

src/main/java/com/rae/creatingspace/api/rendering/GeometryRendering.java

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,12 @@ public static void renderPoly(List<Vec3> pos, VertexConsumer vertexBuilder, Pose
7878
centerPos = centerPos.multiply(1d / pos.size(), 1d / pos.size(), 1d / pos.size());
7979
for (Vec3 coord : pos) {
8080
Vec3 normal = coord.subtract(centerPos);
81-
vertexBuilder.vertex(entry.pose(), (float) coord.x, (float) coord.y, (float) coord.z)
82-
.color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha())
83-
.uv(0, 0)
84-
.overlayCoords(OverlayTexture.NO_OVERLAY)
85-
.uv2(packedLight)
86-
.normal(entry.normal(), (float) normal.x, (float) normal.y, (float) normal.z)
87-
.endVertex();
81+
vertexBuilder.addVertex(entry.pose(), (float) coord.x, (float) coord.y, (float) coord.z)
82+
.setColor(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha())
83+
.setUv(0, 0)
84+
.setOverlay(OverlayTexture.NO_OVERLAY)
85+
.setLight(packedLight)
86+
.setNormal(entry, (float) normal.x, (float) normal.y, (float) normal.z);
8887
}
8988
}
9089

@@ -98,13 +97,12 @@ public static void renderPolyTex(List<Vec3> pos, List<Vec2> uvVector, VertexCons
9897
Vec3 coord = pos.get(i);
9998
Vec2 uv = uvVector.get(i);
10099
Vec3 normal = coord.subtract(centerPos);
101-
vertexBuilder.vertex(entry.pose(), (float) coord.x, (float) coord.y, (float) coord.z)
102-
.color(255, 255, 255, 255)
103-
.uv(uv.x, uv.y)
104-
.overlayCoords(OverlayTexture.NO_OVERLAY)
105-
.uv2(packedLight)
106-
.normal(entry.normal(), (float) normal.x, (float) normal.y, (float) normal.z)
107-
.endVertex();
100+
vertexBuilder.addVertex(entry.pose(), (float) coord.x, (float) coord.y, (float) coord.z)
101+
.setColor(255, 255, 255, 255)
102+
.setUv(uv.x, uv.y)
103+
.setOverlay(OverlayTexture.NO_OVERLAY)
104+
.setLight(packedLight)
105+
.setNormal(entry, (float) normal.x, (float) normal.y, (float) normal.z);
108106
}
109107
}
110108
}

src/main/java/com/rae/creatingspace/api/squedule/ScheduleEntry.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ public class ScheduleEntry {
2424
public ScheduleInstruction instruction;
2525
public List<List<ScheduleWaitCondition>> conditions;
2626

27+
public ScheduleEntry(ScheduleInstruction instruction, List<List<ScheduleWaitCondition>> conditions) {
28+
this.instruction = instruction;
29+
this.conditions = conditions;
30+
}
31+
2732
public ScheduleEntry() {
33+
instruction = null;
2834
conditions = new ArrayList<>();
2935
}
3036

src/main/java/com/rae/creatingspace/api/squedule/condition/PlayerPassengerCondition.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import net.minecraft.world.item.DyeColor;
1717
import net.minecraft.world.item.ItemStack;
1818
import net.minecraft.world.level.Level;
19-
import net.minecraftforge.api.distmarker.Dist;
20-
import net.minecraftforge.api.distmarker.OnlyIn;
19+
import net.neoforged.api.distmarker.Dist;
20+
import net.neoforged.api.distmarker.OnlyIn;
2121

2222
import java.util.List;
2323

src/main/java/com/rae/creatingspace/api/squedule/condition/TimeOfDayCondition.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import net.minecraft.world.item.ItemStack;
2020
import net.minecraft.world.item.Items;
2121
import net.minecraft.world.level.Level;
22-
import net.minecraftforge.api.distmarker.Dist;
23-
import net.minecraftforge.api.distmarker.OnlyIn;
22+
import net.neoforged.api.distmarker.Dist;
23+
import net.neoforged.api.distmarker.OnlyIn;
2424
import org.apache.commons.lang3.mutable.MutableObject;
2525

2626
import java.util.List;
@@ -102,7 +102,7 @@ public boolean renderSpecialIcon(GuiGraphics graphics, int x, int y) {
102102
int displayHr = (intData("Hour") + 12) % 24;
103103
float progress = (displayHr * 60f + intData("Minute")) / (24 * 60);
104104
ResourceLocation location =
105-
new ResourceLocation("textures/item/clock_" + twoDigits(Mth.clamp((int) (progress * 64), 0, 63)) + ".png");
105+
ResourceLocation.parse("textures/item/clock_" + twoDigits(Mth.clamp((int) (progress * 64), 0, 63)) + ".png");
106106
graphics.blit(location,x, y, 0, 0, 0, 16, 16, 16, 16);
107107
return true;
108108
}

src/main/java/com/rae/creatingspace/api/squedule/condition/TimedWaitCondition.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import net.minecraft.world.item.ItemStack;
1212
import net.minecraft.world.item.Items;
1313
import net.minecraft.world.level.Level;
14-
import net.minecraftforge.api.distmarker.Dist;
15-
import net.minecraftforge.api.distmarker.OnlyIn;
14+
import net.neoforged.api.distmarker.Dist;
15+
import net.neoforged.api.distmarker.OnlyIn;
1616

1717
import java.util.List;
1818

@@ -23,9 +23,9 @@ public enum TimeUnit {
2323
SECONDS(20, "s", "generic.unit.seconds"),
2424
MINUTES(20 * 60, "min", "generic.unit.minutes");
2525

26-
public int ticksPer;
27-
public String suffix;
28-
public String key;
26+
public final int ticksPer;
27+
public final String suffix;
28+
public final String key;
2929

3030
TimeUnit(int ticksPer, String suffix, String key) {
3131
this.ticksPer = ticksPer;
@@ -98,10 +98,8 @@ public void initConfigurationWidgets(ModularGuiLineBuilder builder) {
9898
i.lockedTooltipY = 35;
9999
}, "Value");
100100

101-
builder.addSelectionScrollInput(36, 85, (i, l) -> {
102-
i.forOptions(TimeUnit.translatedOptions())
103-
.titled(CreateLang.translateDirect("generic.timeUnit"));
104-
}, "TimeUnit");
101+
builder.addSelectionScrollInput(36, 85, (i, l) -> i.forOptions(TimeUnit.translatedOptions())
102+
.titled(CreateLang.translateDirect("generic.timeUnit")), "TimeUnit");
105103
}
106104

107105
@Override

src/main/java/com/rae/creatingspace/api/squedule/instruction/TextScheduleInstruction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import net.minecraft.ChatFormatting;
77
import net.minecraft.client.gui.components.EditBox;
88
import net.minecraft.network.chat.Component;
9-
import net.minecraftforge.api.distmarker.Dist;
10-
import net.minecraftforge.api.distmarker.OnlyIn;
9+
import net.neoforged.api.distmarker.Dist;
10+
import net.neoforged.api.distmarker.OnlyIn;
1111

1212
import java.util.List;
1313

src/main/java/com/rae/creatingspace/content/event/CSEventHandler.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
import com.rae.creatingspace.init.TagsInit;
1313
import com.rae.creatingspace.legacy.saved.DesignCommands;
1414
import com.rae.creatingspace.content.life_support.spacesuit.OxygenBacktankUtil;
15-
import com.rae.creatingspace.legacy.server.blockentities.ChemicalSynthesizerBlockEntity;
16-
import com.rae.creatingspace.legacy.server.blocks.atmosphere.OxygenBlock;
15+
1716
import com.rae.creatingspace.content.life_support.sealer.RoomAtmosphere;
1817
import com.rae.creatingspace.content.planets.CSDimensionUtil;
1918
import com.rae.creatingspace.content.rocket.CustomTeleporter;
@@ -169,10 +168,6 @@ public static boolean inO2(LivingEntity entity) {
169168
public static void registerCommands(RegisterCommandsEvent event) {
170169
DesignCommands.register(event.getDispatcher());
171170
}
172-
//for legacy purpose
173-
private static boolean isStateBreathable(BlockState state) {
174-
return state.getBlock() instanceof OxygenBlock && state.getValue(OxygenBlock.BREATHABLE);
175-
}
176171

177172
@SubscribeEvent
178173
public static void onBlockPlaced(BlockEvent.NeighborNotifyEvent event) {
@@ -219,7 +214,7 @@ public static class ModBusEvents {
219214
//TODO this is kinda ugly and should be clean/ made better
220215
@SubscribeEvent
221216
public static void registerCapabilities(RegisterCapabilitiesEvent event) {
222-
ChemicalSynthesizerBlockEntity.registerCapabilities(event);
217+
//ChemicalSynthesizerBlockEntity.registerCapabilities(event);
223218
RoomPressuriserBlockEntity.registerCapabilities(event);
224219
CryogenicTankBlockEntity.registerCapabilities(event);
225220
CryogenicTankItem.registerCapabilities(event);

0 commit comments

Comments
 (0)