Skip to content

Commit 6c60e19

Browse files
halotroop2288halotroop2288
committed
Mirrors of register recipe functions
Deprecates the "add" methods to make them all match the "register" naming convention.
1 parent 55d3892 commit 6c60e19

File tree

4 files changed

+71
-25
lines changed

4 files changed

+71
-25
lines changed

‎client/src/main/java/com/fox2code/foxloader/registry/GameRegistryClient.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import net.minecraft.src.game.block.*;
1212
import net.minecraft.src.game.item.*;
1313
import net.minecraft.src.game.recipe.*;
14+
import org.jetbrains.annotations.ApiStatus;
1415

15-
import java.lang.reflect.Constructor;
1616
import java.util.Arrays;
1717
import java.util.Collections;
1818
import java.util.Comparator;
@@ -160,10 +160,7 @@ public Block registerNewBlock0(String name, String ext, BlockBuilder blockBuilde
160160
int blockId = generateNewBlockId(name, fallbackId);
161161
Block block;
162162
Material material = MATERIAL.translate(blockBuilder.builtInMaterial);
163-
String blockName = blockBuilder.blockName == null ? name : blockBuilder.blockName;
164163
Block blockSource = (Block) blockBuilder.blockSource;
165-
String blockType = blockBuilder.blockType == null ?
166-
(blockSource != null ? blockSource.getBlockName() : blockName) : blockBuilder.blockType;
167164
boolean selfNotify = false;
168165
switch (blockBuilder.getBuiltInBlockTypeForConstructor()) {
169166
default:
@@ -300,35 +297,37 @@ private RegisteredItem registerNewItem0(String name, ItemBuilder itemBuilder,
300297
return (RegisteredItem) item;
301298
}
302299

303-
private static boolean recipeFrozen = false;
304-
305300
@Override
306301
public void registerRecipe(RegisteredItemStack result, Object... recipe) {
307-
if (recipeFrozen) throw new IllegalArgumentException("Too late to register recipes!");
302+
if (recipeFrozen) throw new UnsupportedOperationException(LATE_RECIPE_MESSAGE);
308303
CraftingManager.getInstance().addRecipe(toItemStack(result), recipe);
309304
}
310305

311306
@Override
312307
public void registerShapelessRecipe(RegisteredItemStack result, Ingredient... ingredients) {
313-
if (recipeFrozen) throw new IllegalArgumentException("Too late to register recipes!");
308+
if (recipeFrozen) throw new UnsupportedOperationException(LATE_RECIPE_MESSAGE);
314309
CraftingManager.getInstance().addShapelessRecipe(toItemStack(result), (Object[]) ingredients);
315310
}
316311

317312
@Override
318-
public void addFurnaceRecipe(RegisteredItem input, RegisteredItemStack output) {
313+
public void registerFurnaceRecipe(RegisteredItem input, RegisteredItemStack output) {
314+
if (recipeFrozen) throw new UnsupportedOperationException(LATE_RECIPE_MESSAGE);
319315
FurnaceRecipes.instance.addSmelting(input.getRegisteredItemId(), toItemStack(output));
320316
}
321317

322318
@Override
323-
public void addBlastFurnaceRecipe(RegisteredItem input, RegisteredItemStack output) {
319+
public void registerBlastFurnaceRecipe(RegisteredItem input, RegisteredItemStack output) {
320+
if (recipeFrozen) throw new UnsupportedOperationException(LATE_RECIPE_MESSAGE);
324321
BlastFurnaceRecipes.instance.addSmelting(input.getRegisteredItemId(), toItemStack(output));
325322
}
326323

327324
@Override
328-
public void addFreezerRecipe(RegisteredItem input, RegisteredItemStack output) {
325+
public void registerFreezerRecipe(RegisteredItem input, RegisteredItemStack output) {
326+
if (recipeFrozen) throw new UnsupportedOperationException(LATE_RECIPE_MESSAGE);
329327
RefridgifreezerRecipes.instance.addSmelting(input.getRegisteredItemId(), toItemStack(output));
330328
}
331329

330+
@ApiStatus.Internal
332331
public static void freezeRecipes() {
333332
if (recipeFrozen) return;
334333
recipeFrozen = true;

‎common/src/main/java/com/fox2code/foxloader/loader/Mod.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,27 @@ public void registerShapelessRecipe(RegisteredItemStack result, GameRegistry.Ing
269269
GameRegistry.getInstance().registerShapelessRecipe(result, ingredients);
270270
}
271271

272+
/**
273+
* @see GameRegistry#registerFurnaceRecipe(RegisteredItem, RegisteredItemStack)
274+
*/
275+
public void registerFurnaceRecipe(RegisteredItem input, RegisteredItemStack output) {
276+
GameRegistry.getInstance().registerFurnaceRecipe(input, output);
277+
}
278+
279+
/**
280+
* @see GameRegistry#registerBlastFurnaceRecipe(RegisteredItem, RegisteredItemStack)
281+
*/
282+
public void registerBlastFurnaceRecipe(RegisteredItem input, RegisteredItemStack output) {
283+
GameRegistry.getInstance().registerBlastFurnaceRecipe(input, output);
284+
}
285+
286+
/**
287+
* @see GameRegistry#registerFreezerRecipe(RegisteredItem, RegisteredItemStack)
288+
*/
289+
public void registerFreezerRecipe(RegisteredItem input, RegisteredItemStack output) {
290+
GameRegistry.getInstance().registerFreezerRecipe(input, output);
291+
}
292+
272293
// For internal use only
273294
void loaderHandleServerHello(NetworkConnection networkConnection, ServerHello serverHello) {}
274295
void loaderHandleClientHello(NetworkConnection networkPlayer, ClientHello clientHello) {}

‎common/src/main/java/com/fox2code/foxloader/registry/GameRegistry.java‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,42 @@ public final RegisteredItem registerNewItem(String name, ItemBuilder itemBuilder
140140

141141
public abstract RegisteredItem registerNewItem(String name, ItemBuilder itemBuilder, int fallbackId);
142142

143+
protected static final String LATE_RECIPE_MESSAGE = "Too late to register recipes!";
144+
protected static boolean recipeFrozen = false;
145+
143146
public abstract void registerRecipe(RegisteredItemStack result, Object... recipe);
144147

145148
public abstract void registerShapelessRecipe(RegisteredItemStack result, Ingredient... ingredients);
146149

147-
public abstract void addFurnaceRecipe(RegisteredItem input, RegisteredItemStack output);
150+
public abstract void registerFurnaceRecipe(RegisteredItem input, RegisteredItemStack output);
151+
152+
public abstract void registerBlastFurnaceRecipe(RegisteredItem input, RegisteredItemStack output);
148153

149-
public abstract void addBlastFurnaceRecipe(RegisteredItem input, RegisteredItemStack output);
154+
public abstract void registerFreezerRecipe(RegisteredItem input, RegisteredItemStack output);
150155

151-
public abstract void addFreezerRecipe(RegisteredItem input, RegisteredItemStack output);
156+
/**
157+
* @deprecated replace with {@link #registerFurnaceRecipe(RegisteredItem, RegisteredItemStack)}
158+
*/
159+
@Deprecated
160+
public void addFurnaceRecipe(RegisteredItem input, RegisteredItemStack output) {
161+
this.registerFurnaceRecipe(input, output);
162+
}
163+
164+
/**
165+
* @deprecated replace with {@link #registerBlastFurnaceRecipe(RegisteredItem, RegisteredItemStack)}
166+
*/
167+
@Deprecated
168+
public void addBlastFurnaceRecipe(RegisteredItem input, RegisteredItemStack output) {
169+
this.registerBlastFurnaceRecipe(input, output);
170+
}
171+
172+
/**
173+
* @deprecated replace with {@link #registerFreezerRecipe(RegisteredItem, RegisteredItemStack)}
174+
*/
175+
@Deprecated
176+
public void addFreezerRecipe(RegisteredItem input, RegisteredItemStack output) {
177+
this.registerFreezerRecipe(input, output);
178+
}
152179

153180
@LuaInterop
154181
public boolean isFrozen() {

‎server/src/main/java/com/fox2code/foxloader/registry/GameRegistryServer.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import net.minecraft.src.game.item.ItemBlockSlab;
1515
import net.minecraft.src.game.recipe.*;
1616
import net.minecraft.src.server.playergui.StringTranslate;
17+
import org.jetbrains.annotations.ApiStatus;
1718

18-
import java.lang.reflect.Constructor;
1919
import java.util.Comparator;
2020
import java.util.HashMap;
2121
import java.util.Objects;
@@ -147,10 +147,7 @@ public Block registerNewBlock0(String name, String ext, BlockBuilder blockBuilde
147147
int blockId = generateNewBlockId(name, fallbackId);
148148
Block block;
149149
Material material = MATERIAL.translate(blockBuilder.builtInMaterial);
150-
String blockName = blockBuilder.blockName == null ? name : blockBuilder.blockName;
151150
Block blockSource = (Block) blockBuilder.blockSource;
152-
String blockType = blockBuilder.blockType == null ?
153-
(blockSource != null ? blockSource.getBlockName() : blockName) : blockBuilder.blockType;
154151
boolean selfNotify = false;
155152
switch (blockBuilder.getBuiltInBlockTypeForConstructor()) {
156153
default:
@@ -279,35 +276,37 @@ private RegisteredItem registerNewItem0(String name, ItemBuilder itemBuilder,
279276
return (RegisteredItem) item;
280277
}
281278

282-
private static boolean recipeFrozen = false;
283-
284279
@Override
285280
public void registerRecipe(RegisteredItemStack result, Object... recipe) {
286-
if (recipeFrozen) throw new IllegalArgumentException("Too late to register recipes!");
281+
if (recipeFrozen) throw new UnsupportedOperationException(LATE_RECIPE_MESSAGE);
287282
CraftingManager.getInstance().addRecipe(toItemStack(result), recipe);
288283
}
289284

290285
@Override
291286
public void registerShapelessRecipe(RegisteredItemStack result, Ingredient... ingredients) {
292-
if (recipeFrozen) throw new IllegalArgumentException("Too late to register recipes!");
287+
if (recipeFrozen) throw new UnsupportedOperationException(LATE_RECIPE_MESSAGE);
293288
CraftingManager.getInstance().addShapelessRecipe(toItemStack(result), (Object[]) ingredients);
294289
}
295290

296291
@Override
297-
public void addFurnaceRecipe(RegisteredItem input, RegisteredItemStack output) {
292+
public void registerFurnaceRecipe(RegisteredItem input, RegisteredItemStack output) {
293+
if (recipeFrozen) throw new UnsupportedOperationException(LATE_RECIPE_MESSAGE);
298294
FurnaceRecipes.instance.addSmelting(input.getRegisteredItemId(), toItemStack(output));
299295
}
300296

301297
@Override
302-
public void addBlastFurnaceRecipe(RegisteredItem input, RegisteredItemStack output) {
298+
public void registerBlastFurnaceRecipe(RegisteredItem input, RegisteredItemStack output) {
299+
if (recipeFrozen) throw new UnsupportedOperationException(LATE_RECIPE_MESSAGE);
303300
BlastFurnaceRecipes.instance.addSmelting(input.getRegisteredItemId(), toItemStack(output));
304301
}
305302

306303
@Override
307-
public void addFreezerRecipe(RegisteredItem input, RegisteredItemStack output) {
304+
public void registerFreezerRecipe(RegisteredItem input, RegisteredItemStack output) {
305+
if (recipeFrozen) throw new UnsupportedOperationException(LATE_RECIPE_MESSAGE);
308306
RefridgifreezerRecipes.instance.addSmelting(input.getRegisteredItemId(), toItemStack(output));
309307
}
310308

309+
@ApiStatus.Internal
311310
public static void freezeRecipes() {
312311
if (recipeFrozen) return;
313312
recipeFrozen = true;

0 commit comments

Comments
 (0)