Skip to content

Commit 97d259b

Browse files
committed
Version 1.1.11
Changed changed creative mode tab ordering (Also should help for when latest create releases) Also removed some random comments
1 parent f55b5c1 commit 97d259b

File tree

9 files changed

+1223
-14
lines changed

9 files changed

+1223
-14
lines changed

changelog.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
- This also should help to improve performance
1414
1.20.1-1.1.10: |
1515
- Fixed signal placement bug
16-
16+
1.20.1-1.1.11: |
17+
- Changed changed creative mode tab ordering (Also should help for when latest create releases)
1718
...

common/src/main/java/com/cak/pattern_schematics/PatternSchematicsClientEvents.java

-11
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,5 @@ public static boolean onMouseInput(int button, boolean pressed) {
4848

4949
return PatternSchematicsClient.PATTERN_SCHEMATIC_HANDLER.onMouseInput(button, pressed);
5050
}
51-
52-
//Todo: For foge
53-
// @Mod.EventBusSubscriber(value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD)
54-
// public static class ModBusEvents {
55-
//
56-
// @SubscribeEvent
57-
// public static void registerGuiOverlays(RegisterGuiOverlaysEvent event) {
58-
// event.registerAbove(VanillaGuiOverlay.HOTBAR.id(), "pattern_schematic", PatternSchematicsClient.PATTERN_SCHEMATIC_HANDLER);
59-
// }
60-
//
61-
// }
6251

6352
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package com.cak.pattern_schematics.mixin;
2+
3+
import com.cak.pattern_schematics.registry.PatternSchematicsTabInsertions;
4+
import net.minecraft.world.item.Item;
5+
import org.spongepowered.asm.mixin.Mixin;
6+
import org.spongepowered.asm.mixin.injection.At;
7+
import org.spongepowered.asm.mixin.injection.Redirect;
8+
9+
import java.util.List;
10+
11+
@Mixin(remap = false, targets = "com.simibubi.create.AllCreativeModeTabs$RegistrateDisplayItemsGenerator")
12+
public class CreateCreativeModeTabMixin {
13+
14+
@Redirect(method = "collectItems", at = @At(value = "INVOKE", target = "Ljava/util/List;add(Ljava/lang/Object;)Z"))
15+
private boolean addAdditionalItemInject(List<Item> instance, Object element) {
16+
Item itemToAdd = (Item) element;
17+
boolean result = instance.add(itemToAdd);
18+
19+
if (
20+
PatternSchematicsTabInsertions.getAllInsertsAfter()
21+
.containsKey(itemToAdd)
22+
) {
23+
instance.add(
24+
PatternSchematicsTabInsertions.getAllInsertsAfter()
25+
.get(itemToAdd)
26+
);
27+
}
28+
29+
return result;
30+
}
31+
32+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package com.cak.pattern_schematics.registry;
2+
3+
import com.google.common.collect.ImmutableMap;
4+
import com.simibubi.create.AllItems;
5+
import com.tterrag.registrate.util.entry.ItemEntry;
6+
import net.minecraft.world.item.Item;
7+
8+
import java.util.HashMap;
9+
import java.util.Map;
10+
11+
public class PatternSchematicsTabInsertions {
12+
13+
14+
private static Map<Item, Item> INSERTS_AFTER = null;
15+
16+
public static final Map<ItemEntry<Item>, ItemEntry<Item>> REGISTRY_INSERTS_AFTER = Map.of(
17+
AllItems.EMPTY_SCHEMATIC, PatternSchematicsRegistry.EMPTY_PATTERN_SCHEMATIC
18+
);
19+
20+
public static Map<Item, Item> getAllInsertsAfter() {
21+
if (INSERTS_AFTER != null) {
22+
return INSERTS_AFTER;
23+
}
24+
25+
INSERTS_AFTER = new HashMap<>();
26+
for (Map.Entry<ItemEntry<Item>, ItemEntry<Item>> entry : REGISTRY_INSERTS_AFTER.entrySet()) {
27+
INSERTS_AFTER.put(entry.getKey().get(), entry.getValue().get());
28+
}
29+
return INSERTS_AFTER;
30+
}
31+
32+
}

common/src/main/java/com/cak/pattern_schematics/registry/PlatformRegistryTransforms.java

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
public class PlatformRegistryTransforms {
1010

11+
@Deprecated //TODO : not needed, function replaced by tabInsertions
1112
@ExpectPlatform
1213
public static <T extends Item, P> NonNullUnaryOperator<ItemBuilder<T, P>> transformEmptyPatternSchematic() {
1314
throw new AssertionError();

common/src/main/resources/pattern_schematics.common.mixins.json

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"AbstractContraptionEntityMixin",
1010
"BlockHelperMixin",
1111
"CreateClientMixin",
12+
"CreateCreativeModeTabMixin",
1213
"DeployBaseMixin",
1314
"DeployerMovementBehaviorMixin",
1415
"MovementContextMixin",

forge/src/main/java/com/cak/pattern_schematics/registry/forge/PlatformRegistryTransformsImpl.java

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
public class PlatformRegistryTransformsImpl {
1010

1111
public static <T extends Item, P> NonNullUnaryOperator<ItemBuilder<T, P>> transformEmptyPatternSchematic() {
12-
Create.LOGGER.info("suknfidjbsfdgknjg");
1312
return (i) -> i.tab(AllCreativeModeTabs.BASE_CREATIVE_TAB.getKey());
1413
}
1514

forge/src/main/resources/pack.mcmeta

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"pack": {
3-
"description": "Example Mod",
3+
"description": "Create: Pattern Schematics",
44
"pack_format": 8
55
}
66
}

icon.svg

+1,154
Loading

0 commit comments

Comments
 (0)