Skip to content

Commit c751870

Browse files
authored
Merge pull request #375 from SymmetricDevs/xno-rocket
Rockets and rocket components
2 parents ca47737 + 8eeac65 commit c751870

File tree

322 files changed

+85867
-1164
lines changed

Some content is hidden

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

322 files changed

+85867
-1164
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,13 @@ local.properties
8181
run/
8282

8383
logs/
84+
/modpack/
85+
src/main/resources/mixins.susy.json
8486

8587
!run/config/supercritical.cfg
8688

8789
# OptiFine libs
8890
libs/optifine/
91+
92+
# Claude instructions
93+
CLAUDE.md

dependencies.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
2121
*/
2222
dependencies {
23+
implementation 'org.reflections:reflections:0.10.2'
2324

2425
// # Fix crashes on macOS with Narrator
2526
runtimeOnly 'com.cleanroommc:osxnarratorblocker:1.0'
@@ -83,6 +84,7 @@ dependencies {
8384
compileOnly rfg.deobf("curse.maven:creativecore-257814:4722163")
8485
compileOnly rfg.deobf("curse.maven:littletiles-257818:5180387")
8586

87+
runtimeOnly rfg.deobf("curse.maven:serverutil-282484:2503313")
8688
// # Optional dependencies. Uncomment the ones you need
8789
// runtimeOnlyNonPublishable rfg.deobf('curse.maven:the-beneath-254629:3425551')
8890
// runtimeOnlyNonPublishable rfg.deobf('curse.maven:realistic-terrain-generation-unofficial-648514:4404814')

gradle/wrapper/gradle-wrapper.jar

243 Bytes
Binary file not shown.

repositories.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// Add any additional repositories for your dependencies here
2+
3+
repositories {
4+
maven {
5+
name = 'GeckoLib'
6+
url 'https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/'
7+
}
8+
}

run/config/sussypatches.cfg

Lines changed: 262 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,262 @@
1+
# Configuration file
2+
3+
general {
4+
5+
##########################################################################################################
6+
# features
7+
#--------------------------------------------------------------------------------------------------------#
8+
# Config options for additional features
9+
##########################################################################################################
10+
11+
features {
12+
# Adds the retain exact mode to fluid regulators and robot arms.
13+
# It keeps specified amount of item/fluids in the source container.
14+
# Backported from GregTechCEu#2684
15+
# CAUTION: You will HAVE to change this into other transfer modes in your covers before disabling this option or removing this mod. Otherwise your machines may got evaporated.
16+
B:"Add retain exact mode to covers"=true
17+
18+
# Make ConnectedTexturesMod (CTM) work on GregTech multiblocks.
19+
# Needs CTM to be loaded.
20+
B:"Connected textures for multiblocks"=true
21+
22+
# Render a durability bar for drums and quantum tanks, with the same color as the fluid within.
23+
# Note: this won't work when you stack them.
24+
# Stacking non-empty containers is buggy, would not suggest you to do that.
25+
# Requires to turn on 'Enable RenderItemOverlayEvent' in the API option.
26+
B:"Draw fluid bars for fluid container blocks"=true
27+
28+
# Allow you to interact with Quantum Chests with l/r-clicks.
29+
# Much like that of StorageDrawers.
30+
B:"Make Quantum Chest interactable"=true
31+
32+
# Allows maintaining multiblocks with tools from containers in the player's inventory.
33+
# E.g., tool belt or backpacks.
34+
# Note: may slightly affect performance.
35+
B:"Reach deeper in your pocket when maintaining multis"=true
36+
37+
# Simply makes quantum tanks render containing fluids in their item form.
38+
B:"Render quantum tanks fluids in inventories"=true
39+
}
40+
41+
##########################################################################################################
42+
# compatibilities
43+
#--------------------------------------------------------------------------------------------------------#
44+
# Config options for external mod compat
45+
##########################################################################################################
46+
47+
compatibilities {
48+
# Adds an icon in for recipes created by a tweaker mod in JEI.
49+
# Backported from GregTechCEu#2638
50+
B:"Add tweaker icons in JEI"=true
51+
52+
# Stops RFTools Storage Scanner adding GT pipes as inventories.
53+
B:"Exclude GT pipes from Storage Scanners"=true
54+
55+
# Fixes GregTech's DummyWorld crashs with Alfheim v1.6+, which causes all GT recipes to disappear in JEI.
56+
# Fixed in CEu master branch.
57+
B:"Fix Alfheim v1.6+ breaking JEI"=true
58+
59+
# Fixes Fluidlogged API v2 making multiblocks with fluid blocks in the structure failed to render the in-world preview.
60+
# Fixed in Fluidlogged API v3.
61+
B:"Fix Fluidlogged API v2 render failure"=true
62+
63+
# Fixes some GT lamps losing their inventory models when both VintageFix and ConnectedTexturesMod are loaded.
64+
B:"Fix VintageFix making lamps invisible"=true
65+
66+
# Fixes GregTech machines lost their animations when 'On-Demand Animations' is turned on in CensoredASM.
67+
B:"Fix on-demand animations"=true
68+
69+
# Fixes GregTech machines lost their animations when 'Smart Animations' is turned on in OptiFine.
70+
B:"Fix smart animations"=true
71+
72+
# Fixes various GrS issues, including:
73+
# - GrS not respecting the item namespace.
74+
# - Fluid amount multiplier duplicates in the copied recipe removal code.
75+
# Could also fix some CrT issues, but I didn't brother testing.
76+
# Fixed in CEu master branch.
77+
B:"Fix various GrS issues"=true
78+
79+
# Make GT ObjectMappers support GrS inline icon.
80+
# Currently only 'metaitem' mapper is supported.
81+
B:"Inline icon for GT ObjectMappers"=true
82+
}
83+
84+
##########################################################################################################
85+
# bugfixes
86+
#--------------------------------------------------------------------------------------------------------#
87+
# Config options for fixing... bugs
88+
##########################################################################################################
89+
90+
bugfixes {
91+
# Fixes an edge case for cleanroom structure check.
92+
# You can now put hatches at the same axis as the controller on the top layer.
93+
B:"Fix Cleanroom structure check"=true
94+
95+
# Make GT TileEntities aware of nearby chunk loading/unloadings.
96+
# Fixes issues like fluid pipes disconnecting at chunk border after chunk unload.
97+
B:"Fix GT tiles not chunk-aware"=true
98+
99+
# Fix RelativeDirection#LEFT and #RIGHT not treating EnumFacing#DOWN properly.
100+
# Depending on the multi impl this may or may not fix things.
101+
B:"Fix RelativeDirection providing wrong facings"=true
102+
103+
# Fixes clipboards always rendered at full brightness.
104+
B:"Fix clipboards lighting"=true
105+
106+
# Fixes GregTech Crafting Station voiding fluid containers during batch crafting.
107+
B:"Fix crafting station voiding fluid containers"=true
108+
109+
# Refuses insertion into pipenets w/o specific facing.
110+
# Fixes crashes with mods like RFTools.
111+
B:"Fix data transfer between pipes"=true
112+
113+
# Fixes facades have weird lighting.
114+
# A.k.a. different from normal blocks.
115+
B:"Fix facades lighting"=true
116+
117+
# Fix pipe frames not visible on servers.
118+
# Fixed in CEu master branch.
119+
B:"Fix framing pipes not synced on servers"=true
120+
121+
# Fixes in-world preview missing blocks.
122+
# E.g. for Cleanroom.
123+
B:"Fix multiblock preview missing blocks"=true
124+
125+
# Fixes MTE Packet Data Memory Leak
126+
# Fixed in CEu master branch.
127+
B:"Fix packet data memory leak"=true
128+
129+
# Fix potential 'getMinecraftServer' NPE due to TrackedDummyWorld being client-side.
130+
# Fixed in CEu master branch.
131+
B:"Fix potential MTE NPE on integrated servers"=true
132+
133+
# Fixes quadruple and nonuple pipes have rendering issues, like weird lighting, etc.
134+
# Note: this fix simply shrinks their thickness from 0.95 to 0.9375, a magic number that just works.
135+
B:"Fix quad/nonuple pipes rendering"=true
136+
137+
# Implements getItem method for BlockMachine and BlockPipe.
138+
# Fixes mod fail to render GT TileEntities, e.g. XNet.
139+
# Note: for RFTools you will need ReFinedTools.
140+
# Fixed in CEu master branch.
141+
B:"Implement getItem for BlockMachine"=true
142+
143+
# Fixes surface populators only generate in one of the chunk quadrants.
144+
# Backported from GregTechCEu#2875
145+
B:"Make surface populators populate the whole chunk"=true
146+
147+
# Properly unbinds the bound framebuffer object for shaders.
148+
# Potentially fixes bloom incorrectly showing through blocks.
149+
# Fixed in CEu master branch.
150+
B:"Properly unbinding Framebuffer for shaders"=true
151+
152+
# Removes the override to 'addDisplayText' in DistillationTower class.
153+
# Which is both bugged and unnecessary.
154+
# Fixed in CEu master branch.
155+
B:"Remove the bugged 'addDisplayText' override"=true
156+
157+
# Fixes the sometimes-funny 'Gas Gas' suffix.
158+
# Fixed in CEu master branch.
159+
B:"Removes the redundant 'Gas' suffix"=true
160+
161+
# Don't let GTCEu register pipes for empty registrations.
162+
# Fixes crashes for mods like BetterQuesting.
163+
# Fixed in CEu master branch.
164+
B:"Stop invalid pipe registration"=true
165+
166+
# Uses WeakReference for NeighborCacheTileEntityBase.
167+
# May solve unintended JVM garbage collection hindering.
168+
# Fixed in CEu master branch.
169+
B:"Use WeakReference for neighbor cache"=true
170+
}
171+
172+
##########################################################################################################
173+
# tweaks
174+
#--------------------------------------------------------------------------------------------------------#
175+
# Config options for tweaking existing features
176+
##########################################################################################################
177+
178+
tweaks {
179+
# Literally. Just made it possible for mobs to spawn on GT stone blocks.
180+
# Backported from GregTechCEu#2859
181+
B:"Allow mob spawning on GT stones"=true
182+
183+
# Removes the muffler inventory and recovery mechanics.
184+
# Who would ever use them, anyways.
185+
# Would help with performance, in a way.
186+
# Backported from GregTechCEu#2799 and Nomi-Libs
187+
B:"Disable the muffler recovery mechanic"=true
188+
189+
# Basically just give GT blocks and MetaTileEntities proper sound types based on their materials.
190+
# Backported from GregTechCEu#2853
191+
B:"Give GT blocks & MTEs proper step sounds"=true
192+
193+
# Makes multiblocks place hatches much less eagerly.
194+
# Also makes it replace replaceable blocks properly.
195+
B:"Improve Multiblock auto-building"=true
196+
197+
# Cleans-up the CEu ore vein info page.
198+
# Adds an api to add display items for dimensions the vein could spawn in.
199+
# Note: has an issue with AdvancedRocketory due to its dimensions being registered too late.
200+
B:"Improve ore vein info page in JEI"=false
201+
202+
# Doubles the thickness of covers on a pipe.
203+
# So that they look the same as in GT5.
204+
B:"Make covers on a pipe thicker"=true
205+
206+
# Uses VBO for JEI preview renderer, which would significantly reduce the render lag.
207+
# Also removes the ISceneRenderHook logic from the WorldSceneRenderer, which reduces the allocation in multiblock previews.
208+
# Note: has some minor issues with the terminal.
209+
# Backported from GregTechCEu#2629
210+
B:"Optimize JEI multiblock preview"=true
211+
212+
# Make prospectors place waypoints at the average height of the hovered ores.
213+
# Less tedious than having to look it up in jei or blindly mining up or down.
214+
# Backported from GregTechCEu#2726
215+
B:"Place ore prospector waypoints at vein height"=true
216+
217+
# Removes the annoying search bars from GT Creative Tabs.
218+
B:"Remove search bars from GT tabs"=true
219+
220+
# Makes GT machine items render their active-state textures.
221+
# So that they look the same as in GT5.
222+
B:"Render active textures for GT machine items"=false
223+
224+
# Replaces the text for Creative Chest/Tanks.
225+
# Leave this empty to use default numbers.
226+
S:"Replace Creative Chest/Tank display text"=
227+
228+
# Add all GT tools made of different materials to JEI.
229+
# Also separating their recipes.
230+
# Note: CEu code here is really shitty, use at your own risk.
231+
B:"Show all GT tools in JEI"=false
232+
233+
# Switches from GT's own impl of XSTR to XoShiRo256++ random generator.
234+
# Which has both better performance and better randomness.
235+
# Backported from GregTechCEu#2747
236+
B:"Use XoShiRo256++ Random"=true
237+
}
238+
239+
##########################################################################################################
240+
# apis
241+
#--------------------------------------------------------------------------------------------------------#
242+
# Config options for possibly useful apis
243+
# Don't enable them unless you know what you are doing
244+
##########################################################################################################
245+
246+
apis {
247+
# Supports using ModularUI2 for GT MTEs, metaitems, and covers.
248+
# Backported from GregTechCEu#2264 & #2281
249+
B:"Enable ModularUI2 support"=true
250+
251+
# Supports documentation being attached to GT recipes that can be shown in JEI.
252+
B:"Enable Recipe Info"=true
253+
254+
# Let all material cable and pipe textures be configurable with its icon set texture.
255+
# Note: if this option is enabled, then the correspondence textures in default path will invalid,
256+
# only the textures in its icon set path will be rendered.
257+
B:"Render cable and pipe textures from its icon set"=true
258+
}
259+
260+
}
261+
262+
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package org.embeddedt.embeddium.impl.render.chunk.compile;
2+
3+
/// Adapted and minimized from
4+
/// [Celeritas](https://git.taumc.org/embeddedt/celeritas/src/branch/stonecutter/common/src/main/java/org/embeddedt/embeddium/impl/render/chunk/compile/ChunkBuildContext.java)
5+
public abstract class ChunkBuildContext {}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package org.embeddedt.embeddium.impl.render.chunk.compile;
2+
3+
/// Adapted and minimized from
4+
/// [Celeritas](https://git.taumc.org/embeddedt/celeritas/src/branch/stonecutter/common/src/main/java/org/embeddedt/embeddium/impl/render/chunk/compile/ChunkBuildOutput.java)
5+
public abstract class ChunkBuildOutput {}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package org.embeddedt.embeddium.impl.util.task;
2+
3+
/// Adapted and minimized from
4+
/// [Celeritas](https://git.taumc.org/embeddedt/celeritas/src/branch/stonecutter/common/src/main/java/org/embeddedt/embeddium/impl/util/task/CancellationToken.java)
5+
public interface CancellationToken {}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package org.taumc.celeritas.impl.render.terrain.compile.task;
2+
3+
import net.minecraft.block.Block;
4+
import net.minecraft.util.math.BlockPos;
5+
import net.minecraftforge.fml.relauncher.Side;
6+
import net.minecraftforge.fml.relauncher.SideOnly;
7+
import org.embeddedt.embeddium.impl.render.chunk.compile.ChunkBuildContext;
8+
import org.embeddedt.embeddium.impl.render.chunk.compile.ChunkBuildOutput;
9+
import org.embeddedt.embeddium.impl.util.task.CancellationToken;
10+
11+
/// Adapted and minimized from
12+
/// [Celeritas](https://git.taumc.org/embeddedt/celeritas/src/branch/stonecutter/forge122/src/main/java/org/taumc/celeritas/impl/render/terrain/compile/task/ChunkBuilderMeshingTask.java)
13+
public abstract class ChunkBuilderMeshingTask {
14+
15+
@SuppressWarnings({"DataFlowIssue", "unused"})
16+
public ChunkBuildOutput execute(ChunkBuildContext context, CancellationToken cancellationToken) {
17+
// Dummy method body
18+
BlockPos.MutableBlockPos blockPos = null;
19+
Block block = null;
20+
block.canRenderInLayer(null, null);
21+
return null;
22+
}
23+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package cam72cam.immersiverailroading.registry;
2+
3+
import cam72cam.immersiverailroading.entity.EntityRollingStock;
4+
import cam72cam.immersiverailroading.util.DataBlock;
5+
6+
public class FreightDefinitionBridge extends FreightDefinition {
7+
8+
public FreightDefinitionBridge(Class<? extends EntityRollingStock> type, String defID,
9+
DataBlock data) throws Exception {
10+
super(type, defID, data);
11+
}
12+
}

0 commit comments

Comments
 (0)